Add Unicode input support

2026-10-13 12:04:09 +00:00 · 2021-08-17 23:55:53 -05:00
182 changed files with 2819 additions and 8957 deletions
@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Follow the troubleshooting guide before reporting a bug
+
+---
+**READ ME FIRST!**
+If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
+
+If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce**
+Any special steps that are required for the bug to appear.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
+
+**Affected games**
+List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
+
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on PC or iOS?
+
+**Moonlight settings (please complete the following information)**
+- Have any settings been adjusted from defaults?
+- If so, which settings have been changed?
+- Does the problem still occur after reverting settings back to default?
+
+**Gamepad-related issues (please complete if problem is gamepad-related)**
+- Do you have any gamepads connected to your host PC directly?
+- If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
+- Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad?
+  - Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
+
+**Device details (please complete the following information)**
+ - Android version: [e.g. Android 10]
+ - Device model: [e.g. Samsung Galaxy S21]
+
+**Server PC details (please complete the following information)**
+ - OS: [e.g. Windows 10 1809]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]
+ - Antivirus and firewall software: [e.g. Windows Defender and Windows Firewall]
+
+**Additional context**
+Anything else you think may be relevant to the issue or special about your specific setup.
@@ -1,176 +0,0 @@
-name: Bug report
-description: Follow the troubleshooting guide before reporting a bug
-title: "[Issue]: "
-labels: bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to fill out this bug form!
-        
-        **READ ME FIRST!**
-        If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
-        
-        If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
-  - type: textarea
-    id: describe-bug
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    id: steps-reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Any special steps that are required for the bug to appear.
-    validations:
-      required: true
-  - type: textarea
-    id: affected-games
-    attributes:
-      label: Affected games
-      description: List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
-    validations:
-      required: true   
-  - type: dropdown
-    id: other-clients
-    attributes:
-      label: Other Moonlight clients
-      description: Does the issue occur when using Moonlight on PC or iOS?
-      options:
-        - "PC"
-        - "iOS"
-    validations:
-      required: true
-  - type: dropdown
-    id: settings-adjusted
-    attributes:
-      label: Moonlight adjusted settings
-      description: Have any settings been adjusted from defaults?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: textarea
-    id: settings-adjusted-settings
-    attributes:
-      label: Moonlight adjusted settings (please complete the following information)
-      description: If the settings have been adjusted, which settings have been changed?
-    validations:
-      required: true
-  - type: dropdown
-    id: settings-default
-    attributes:
-      label: Moonlight default settings
-      description: Does the problem still occur after reverting settings back to default?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: dropdown
-    id: gamepad-connected
-    attributes:
-      label: Gamepad-related connection issue
-      description: Do you have any gamepads connected to your host PC directly?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: dropdown
-    id: gamepad-on-screen
-    attributes:
-      label: Gamepad-related input issue
-      description: If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: dropdown
-    id: gamepad-test
-    attributes:
-      label: Gamepad-related streaming issue
-      description: |
-        Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad? 
-        Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-  - type: input
-    id: android
-    attributes:
-      label: Android version
-      description: What is the Android version?
-      placeholder: e.g. Android 10
-    validations:
-      required: true      
-  - type: input
-    id: device
-    attributes:
-      label: Device model
-      description: What is the device model?
-      placeholder: e.g. Samsung Galaxy S21
-    validations:
-      required: true
-  - type: input
-    id: server-os
-    attributes:
-      label: Server PC OS version
-      description: What is the PC OS version?
-      placeholder: e.g. Windows 10 1809
-    validations:
-      required: true
-  - type: input
-    id: server-geforce
-    attributes:
-      label: Server PC GeForce Experience version
-      description: What is the GeForce Experience version?
-      placeholder: e.g. 3.16.0.140
-    validations:
-      required: true
-  - type: input
-    id: server-driver
-    attributes:
-      label: Server PC Nvidia GPU driver version
-      description: What is the Nvidia GPU driver version?
-      placeholder: e.g. 417.35
-    validations:
-      required: true
-  - type: input
-    id: server-antivirus
-    attributes:
-      label: Server PC antivirus and firewall software
-      description: Which antivirus and firewall software are installed on the Server PC?
-      placeholder: e.g. Windows Defender and Windows Firewall
-    validations:
-      required: true      
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
-    validations:
-      required: false
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: |
-        Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: Shell
-    validations:
-      required: false      
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional context
-      description: Anything else you think may be relevant to the issue or special about your specific setup.
-    validations:
-      required: false
-      
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -1,37 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project
-title: "[Feature request]: "
-labels: enhancement
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to fill out this feature form!
-  - type: textarea
-    id: feature
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true      
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: true      
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false
@@ -3,7 +3,7 @@
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/232a8tadrrn8jv0k/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-android/branch/master)
 [![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-android/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-android/)

-[Moonlight for Android](https://moonlight-stream.org) is an open source client for NVIDIA GameStream, as used by the NVIDIA Shield.
+[Moonlight for Android](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.

 Moonlight for Android will allow you to stream your full collection of games from your Windows PC to your Android device,
 whether in your own home or over the internet.
@@ -1,30 +1,25 @@
 apply plugin: 'com.android.application'

 android {
-    ndkVersion "23.2.8568313"
+    ndkVersion "22.1.7171670"

-    compileSdk 33
-
-    namespace 'com.limelight'
+    compileSdkVersion 31

    defaultConfig {
-        minSdk 16
-        targetSdk 33
+        minSdkVersion 16
+        targetSdkVersion 31

-        versionName "11.0"
-        versionCode = 306
-
-        // Generate native debug symbols to allow Google Play to symbolicate our native crashes
-        ndk.debugSymbolLevel = 'FULL'
+        versionName "9.10"
+        versionCode = 270
    }

-    flavorDimensions.add("root")
+    flavorDimensions "root"

    productFlavors {
        root {
            // Android O has native mouse capture, so don't show the rooted
            // version to devices running O on the Play Store.
-            maxSdk 25
+            maxSdkVersion 25

            externalNativeBuild {
                ndkBuild {
@@ -34,7 +29,6 @@ android {

            applicationId "com.limelight.root"
            dimension "root"
-            buildConfigField "boolean", "ROOT_BUILD", "true"
        }

        nonRoot {
@@ -46,19 +40,12 @@ android {

            applicationId "com.limelight"
            dimension "root"
-            buildConfigField "boolean", "ROOT_BUILD", "false"
        }
    }

-    compileOptions {
-        encoding "UTF-8"
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
-    lint {
+    lintOptions {
        disable 'MissingTranslation'
-        lintConfig file('lint.xml')
+        lintConfig file("lint.xml")
    }

    bundle {
@@ -68,7 +55,7 @@ android {
            enableSplit = false
        }
        density {
-            // FIXME: This should not be necessary but we get
+            // FIXME: This should not be neccessary but we get
            // weird crashes due to missing drawable resources
            // when this split is enabled.
            enableSplit = false
@@ -78,8 +65,6 @@ android {
    buildTypes {
        debug {
            applicationIdSuffix ".debug"
-            resValue "string", "app_label", "Moonlight (Debug)"
-            resValue "string", "app_label_root", "Moonlight (Root Debug)"

            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -116,8 +101,6 @@ android {
            //
            // TL;DR: Leave the following line alone!
            applicationIdSuffix ".unofficial"
-            resValue "string", "app_label", "Moonlight"
-            resValue "string", "app_label_root", "Moonlight (Root)"

            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -129,15 +112,16 @@ android {
            path "src/main/jni/Android.mk"
        }
    }
+
+    // Generate native debug symbols to allow Google Play to symbolicate our native crashes
+    android.defaultConfig.ndk.debugSymbolLevel = 'FULL'
 }

 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.69'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
    implementation 'org.jcodec:jcodec:0.2.3'
    implementation 'com.squareup.okhttp3:okhttp:3.12.13'
    implementation 'com.squareup.okio:okio:1.17.5'
-    // 3.5.8 requires minSdk 19, uses StandardCharsets.UTF_8 internally
    implementation 'org.jmdns:jmdns:3.5.7'
-    implementation 'com.github.cgutman:ShieldControllerExtensions:1.0'
 }
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_label" translatable="false">Moonlight (Debug)</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root Debug)</string>
+
+</resources>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.limelight">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -43,31 +44,22 @@
        android:roundIcon="@mipmap/ic_launcher"
        android:installLocation="auto"
        android:gwpAsanMode="always"
-        android:localeConfig="@xml/locales_config"
-        android:enableOnBackInvokedCallback="false"
        android:theme="@style/AppTheme">
-
        <provider
            android:name=".PosterContentProvider"
            android:authorities="poster.${applicationId}"
            android:enabled="true"
            android:exported="true">
        </provider>
-
        <!-- Samsung multi-window support -->
        <uses-library
            android:name="com.sec.android.app.multiwindow"
            android:required="false" />
+
        <meta-data
            android:name="com.sec.android.support.multiwindow"
            android:value="true" />

-        <!-- Disable Game Mode downscaling since it can break our UI dialogs and doesn't benefit
-             performance much for us since we don't use GL/Vulkan for rendering anyway -->
-        <meta-data
-            android:name="com.android.graphics.intervention.wm.allowDownscale"
-            android:value="false"/>
-
        <!-- Samsung DeX support requires explicit placement of android:resizeableActivity="true"
             in each activity even though it is implied by targeting API 24+ -->

@@ -107,7 +99,6 @@
        <activity
            android:name=".preferences.StreamSettings"
            android:resizeableActivity="true"
-            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
            android:label="Streaming Settings">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
@@ -117,15 +108,16 @@
            android:name=".preferences.AddComputerManually"
            android:resizeableActivity="true"
            android:windowSoftInputMode="stateVisible"
-            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
            android:label="Add Computer Manually">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.PcView" />
        </activity>
+        <!-- This will fall back to sensorLandscape at runtime on Android 4.2 and below -->
        <activity
            android:name=".Game"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:screenOrientation="userLandscape"
            android:noHistory="true"
            android:supportsPictureInPicture="true"
            android:resizeableActivity="true"
@@ -293,11 +293,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

        setContentView(R.layout.activity_app_view);

-        // Allow floating expanded PiP overlays while browsing apps
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            setShouldDockBigOverlays(false);
-        }
-
        UiHelper.notifyNewRootView(this);

        showHiddenApps = getIntent().getBooleanExtra(SHOW_HIDDEN_APPS_EXTRA, false);
@@ -2,12 +2,9 @@ package com.limelight;

 import android.app.Activity;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Bundle;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.window.OnBackInvokedCallback;
-import android.window.OnBackInvokedDispatcher;

 import com.limelight.utils.SpinnerDialog;

@@ -16,26 +13,10 @@ public class HelpActivity extends Activity {
    private SpinnerDialog loadingDialog;
    private WebView webView;

-    private boolean backCallbackRegistered;
-    private OnBackInvokedCallback onBackInvokedCallback;
-
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            onBackInvokedCallback = new OnBackInvokedCallback() {
-                @Override
-                public void onBackInvoked() {
-                    // We should always be able to go back because we unregister our callback
-                    // when we can't go back. Nonetheless, we will still check anyway.
-                    if (webView.canGoBack()) {
-                        webView.goBack();
-                    }
-                }
-            };
-        }
-
        webView = new WebView(this);
        setContentView(webView);

@@ -58,8 +39,6 @@ public class HelpActivity extends Activity {
                            getResources().getString(R.string.help_loading_title),
                            getResources().getString(R.string.help_loading_msg), false);
                }
-
-                refreshBackDispatchState();
            }

            @Override
@@ -68,41 +47,19 @@ public class HelpActivity extends Activity {
                    loadingDialog.dismiss();
                    loadingDialog = null;
                }
+            }

-                refreshBackDispatchState();
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return !(url.toUpperCase().startsWith("https://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()) ||
+                        url.toUpperCase().startsWith("http://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()));
            }
        });

        webView.loadUrl(getIntent().getData().toString());
    }

-    private void refreshBackDispatchState() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (webView.canGoBack() && !backCallbackRegistered) {
-                getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
-                        OnBackInvokedDispatcher.PRIORITY_DEFAULT, onBackInvokedCallback);
-                backCallbackRegistered = true;
-            }
-            else if (!webView.canGoBack() && backCallbackRegistered) {
-                getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(onBackInvokedCallback);
-                backCallbackRegistered = false;
-            }
-        }
-    }
-
    @Override
-    protected void onDestroy() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (backCallbackRegistered) {
-                getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(onBackInvokedCallback);
-            }
-        }
-
-        super.onDestroy();
-    }
-
-    @Override
-    // NOTE: This will NOT be called on Android 13+ with android:enableOnBackInvokedCallback="true"
    public void onBackPressed() {
        // Back goes back through the WebView history
        // until no more history remains
@@ -118,18 +118,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    private final static int VIEW_DETAILS_ID = 8;
    private final static int FULL_APP_LIST_ID = 9;
    private final static int TEST_NETWORK_ID = 10;
-    private final static int GAMESTREAM_EOL_ID = 11;

    private void initializeViews() {
        setContentView(R.layout.activity_pc_view);

        UiHelper.notifyNewRootView(this);

-        // Allow floating expanded PiP overlays while browsing PCs
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            setShouldDockBigOverlays(false);
-        }
-
        // Set default preferences if we've never been run
        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);

@@ -353,13 +347,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        if (computer.details.state == ComputerDetails.State.OFFLINE ||
            computer.details.state == ComputerDetails.State.UNKNOWN) {
            menu.add(Menu.NONE, WOL_ID, 1, getResources().getString(R.string.pcview_menu_send_wol));
-            menu.add(Menu.NONE, GAMESTREAM_EOL_ID, 2, getResources().getString(R.string.pcview_menu_eol));
        }
        else if (computer.details.pairState != PairState.PAIRED) {
            menu.add(Menu.NONE, PAIR_ID, 1, getResources().getString(R.string.pcview_menu_pair_pc));
-            if (computer.details.nvidiaServer) {
-                menu.add(Menu.NONE, GAMESTREAM_EOL_ID, 2, getResources().getString(R.string.pcview_menu_eol));
-            }
        }
        else {
            if (computer.details.runningGameId != 0) {
@@ -367,10 +357,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
            }

-            if (computer.details.nvidiaServer) {
-                menu.add(Menu.NONE, GAMESTREAM_EOL_ID, 3, getResources().getString(R.string.pcview_menu_eol));
-            }
-
            menu.add(Menu.NONE, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_app_list));
        }

@@ -388,10 +374,15 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    }

    private void doPair(final ComputerDetails computer) {
-        if (computer.state == ComputerDetails.State.OFFLINE || computer.activeAddress == null) {
+        if (computer.state == ComputerDetails.State.OFFLINE ||
+                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
            Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
            return;
        }
+        if (computer.runningGameId != 0) {
+            Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_ingame), Toast.LENGTH_LONG).show();
+            return;
+        }
        if (managerBinder == null) {
            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
            return;
@@ -409,7 +400,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                    stopComputerUpdates(true);

                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
-                            computer.httpsPort, managerBinder.getUniqueId(), computer.serverCert,
+                            managerBinder.getUniqueId(),
+                            computer.serverCert,
                            PlatformBinding.getCryptoProvider(PcView.this));
                    if (httpConn.getPairState() == PairState.PAIRED) {
                        // Don't display any toast, but open the app list
@@ -421,22 +413,16 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {

                        // Spin the dialog off in a thread because it blocks
                        Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
-                                getResources().getString(R.string.pair_pairing_msg)+" "+pinStr+"\n\n"+
-                                getResources().getString(R.string.pair_pairing_help), false);
+                                getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);

                        PairingManager pm = httpConn.getPairingManager();

-                        PairState pairState = pm.pair(httpConn.getServerInfo(true), pinStr);
+                        PairState pairState = pm.pair(httpConn.getServerInfo(), pinStr);
                        if (pairState == PairState.PIN_WRONG) {
                            message = getResources().getString(R.string.pair_incorrect_pin);
                        }
                        else if (pairState == PairState.FAILED) {
-                            if (computer.runningGameId != 0) {
-                                message = getResources().getString(R.string.pair_pc_ingame);
-                            }
-                            else {
-                                message = getResources().getString(R.string.pair_fail);
-                            }
+                            message = getResources().getString(R.string.pair_fail);
                        }
                        else if (pairState == PairState.ALREADY_IN_PROGRESS) {
                            message = getResources().getString(R.string.pair_already_in_progress);
@@ -526,7 +512,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    }

    private void doUnpair(final ComputerDetails computer) {
-        if (computer.state == ComputerDetails.State.OFFLINE || computer.activeAddress == null) {
+        if (computer.state == ComputerDetails.State.OFFLINE ||
+                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
            Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
            return;
        }
@@ -543,7 +530,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                String message;
                try {
                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
-                            computer.httpsPort, managerBinder.getUniqueId(), computer.serverCert,
+                            managerBinder.getUniqueId(),
+                            computer.serverCert,
                            PlatformBinding.getCryptoProvider(PcView.this));
                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                        httpConn.unpair();
@@ -666,10 +654,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                ServerHelper.doNetworkTest(PcView.this);
                return true;

-            case GAMESTREAM_EOL_ID:
-                HelpLauncher.launchGameStreamEolFaq(PcView.this);
-                return true;
-
            default:
                return super.onContextItemSelected(item);
        }
@@ -13,13 +13,11 @@ import com.limelight.computers.ComputerManagerService;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.PairingManager;
-import com.limelight.nvstream.wol.WakeOnLanSender;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.ServerHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;

-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.UUID;

@@ -28,7 +26,6 @@ public class ShortcutTrampoline extends Activity {
    private NvApp app;
    private ArrayList<Intent> intentStack = new ArrayList<>();

-    private int wakeHostTries = 10;
    private ComputerDetails computer;
    private SpinnerDialog blockingLoadSpinner;

@@ -82,23 +79,6 @@ public class ShortcutTrampoline extends Activity {
                                return;
                            }

-                            // Try to wake the target PC if it's offline (up to some retry limit)
-                            if (details.state == ComputerDetails.State.OFFLINE && details.macAddress != null && --wakeHostTries >= 0) {
-                                try {
-                                    // Make a best effort attempt to wake the target PC
-                                    WakeOnLanSender.sendWolPacket(computer);
-
-                                    // If we sent at least one WoL packet, reset the computer state
-                                    // to force ComputerManager to poll it again.
-                                    managerBinder.invalidateStateForComputer(computer.uuid);
-                                    return;
-                                } catch (IOException e) {
-                                    // If we got an exception, we couldn't send a single WoL packet,
-                                    // so fallthrough into the offline error path.
-                                    e.printStackTrace();
-                                }
-                            }
-
                            if (details.state != ComputerDetails.State.UNKNOWN) {
                                runOnUiThread(new Runnable() {
                                    @Override
@@ -8,6 +8,16 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
 import com.limelight.nvstream.http.LimelightCryptoProvider;

 public class PlatformBinding {
+    public static String getDeviceName() {
+        String deviceName = android.os.Build.MODEL;
+        deviceName = deviceName.replace(" ", "");
+        return deviceName;
+    }
+
+    public static AudioRenderer getAudioRenderer() {
+        return new AndroidAudioRenderer();
+    }
+
    public static LimelightCryptoProvider getCryptoProvider(Context c) {
        return new AndroidCryptoProvider(c);
    }
@@ -1,12 +1,9 @@
 package com.limelight.binding.audio;

-import android.content.Context;
-import android.content.Intent;
 import android.media.AudioAttributes;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
-import android.media.audiofx.AudioEffect;
 import android.os.Build;

 import com.limelight.LimeLog;
@@ -15,16 +12,8 @@ import com.limelight.nvstream.jni.MoonBridge;

 public class AndroidAudioRenderer implements AudioRenderer {

-    private final Context context;
-    private final boolean enableAudioFx;
-
    private AudioTrack track;

-    public AndroidAudioRenderer(Context context, boolean enableAudioFx) {
-        this.context = context;
-        this.enableAudioFx = enableAudioFx;
-    }
-
    private AudioTrack createAudioTrack(int channelConfig, int sampleRate, int bufferSize, boolean lowLatency) {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
            return new AudioTrack(AudioManager.STREAM_MUSIC,
@@ -172,12 +161,6 @@ public class AndroidAudioRenderer implements AudioRenderer {
                continue;
            }

-            // Skip low latency options when using audio effects, since low latency mode
-            // precludes the use of the audio effect pipeline (as of Android 13).
-            if (enableAudioFx && lowLatency) {
-                continue;
-            }
-
            try {
                track = createAudioTrack(channelConfig, sampleRate, bufferSize, lowLatency);
                track.play();
@@ -220,27 +203,10 @@ public class AndroidAudioRenderer implements AudioRenderer {
    }

    @Override
-    public void start() {
-        if (enableAudioFx) {
-            // Open an audio effect control session to allow equalizers to apply audio effects
-            Intent i = new Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION);
-            i.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, track.getAudioSessionId());
-            i.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.getPackageName());
-            i.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_GAME);
-            context.sendBroadcast(i);
-        }
-    }
+    public void start() {}

    @Override
-    public void stop() {
-        if (enableAudioFx) {
-            // Close our audio effect control session when we're stopping
-            Intent i = new Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION);
-            i.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, track.getAudioSessionId());
-            i.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.getPackageName());
-            context.sendBroadcast(i);
-        }
-    }
+    public void stop() {}

    @Override
    public void cleanup() {
@@ -67,12 +67,14 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
            return null;
        }

-        try (final FileInputStream fin = new FileInputStream(f)) {
+        try {
+            FileInputStream fin = new FileInputStream(f);
            byte[] fileData = new byte[(int) f.length()];
            if (fin.read(fileData) != f.length()) {
                // Failed to read
                fileData = null;
            }
+            fin.close();
            return fileData;
        } catch (IOException e) {
            return null;
@@ -158,28 +160,32 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
    }

    private void saveCertKeyPair() {
-        try (final FileOutputStream certOut = new FileOutputStream(certFile);
-             final FileOutputStream keyOut = new FileOutputStream(keyFile)
-        ) {
+        try {
+            FileOutputStream certOut = new FileOutputStream(certFile);
+            FileOutputStream keyOut = new FileOutputStream(keyFile);
+
            // Write the certificate in OpenSSL PEM format (important for the server)
            StringWriter strWriter = new StringWriter();
-            try (final JcaPEMWriter pemWriter = new JcaPEMWriter(strWriter)) {
-                pemWriter.writeObject(cert);
-            }
+            JcaPEMWriter pemWriter = new JcaPEMWriter(strWriter);
+            pemWriter.writeObject(cert);
+            pemWriter.close();

            // Line endings MUST be UNIX for the PC to accept the cert properly
-            try (final OutputStreamWriter certWriter = new OutputStreamWriter(certOut)) {
-                String pemStr = strWriter.getBuffer().toString();
-                for (int i = 0; i < pemStr.length(); i++) {
-                    char c = pemStr.charAt(i);
-                    if (c != '\r')
-                        certWriter.append(c);
-                }
+            OutputStreamWriter certWriter = new OutputStreamWriter(certOut);
+            String pemStr = strWriter.getBuffer().toString();
+            for (int i = 0; i < pemStr.length(); i++) {
+                char c = pemStr.charAt(i);
+                if (c != '\r')
+                    certWriter.append(c);
            }
+            certWriter.close();

            // Write the private out in PKCS8 format
            keyOut.write(key.getEncoded());

+            certOut.close();
+            keyOut.close();
+
            LimeLog.info("Saved generated key pair to disk");
        } catch (IOException e) {
            // This isn't good because it means we'll have
@@ -9,9 +9,7 @@ import android.hardware.usb.UsbManager;
 import android.media.AudioAttributes;
 import android.os.Build;
 import android.os.CombinedVibration;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.VibrationAttributes;
+import android.os.SystemClock;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.os.VibratorManager;
@@ -33,9 +31,9 @@ import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.GameGestures;
 import com.limelight.utils.Vector2d;

-import org.cgutman.shieldcontrollerextensions.SceManager;
-
 import java.lang.reflect.InvocationTargetException;
+import java.util.Timer;
+import java.util.TimerTask;

 public class ControllerHandler implements InputManager.InputDeviceListener, UsbDriverListener {

@@ -48,6 +46,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private static final int EMULATING_SPECIAL = 0x1;
    private static final int EMULATING_SELECT = 0x2;

+    private static final int EMULATED_SPECIAL_UP_DELAY_MS = 100;
+    private static final int EMULATED_SELECT_UP_DELAY_MS = 30;
+
    private final Vector2d inputVector = new Vector2d();

    private final SparseArray<InputDeviceContext> inputDeviceContexts = new SparseArray<>();
@@ -59,8 +60,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private final InputDeviceContext defaultContext = new InputDeviceContext();
    private final GameGestures gestures;
    private final Vibrator deviceVibrator;
-    private final SceManager sceManager;
-    private final Handler handler;
    private boolean hasGameController;

    private final PreferenceConfiguration prefConfig;
@@ -72,12 +71,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        this.gestures = gestures;
        this.prefConfig = prefConfig;
        this.deviceVibrator = (Vibrator) activityContext.getSystemService(Context.VIBRATOR_SERVICE);
-        this.handler = new Handler(Looper.getMainLooper());

-        this.sceManager = new SceManager(activityContext);
-        this.sceManager.start();
-
-        int deadzonePercentage = prefConfig.deadzonePercentage;
+        // HACK: For now we're hardcoding a 7% deadzone. Some deadzone
+        // is required for controller batching support to work.
+        int deadzonePercentage = 7;

        int[] ids = InputDevice.getDeviceIds();
        for (int id : ids) {
@@ -204,7 +201,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            deviceContext.destroy();
        }

-        sceManager.stop();
        deviceVibrator.cancel();
    }

@@ -510,7 +506,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }
        LimeLog.info(dev.toString());

-        context.inputDevice = dev;
        context.name = devName;
        context.id = dev.getId();
        context.external = isExternal(dev);
@@ -708,6 +703,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            }
            // SHIELD controllers will use small stick deadzones
            else if (devName.contains("SHIELD") || devName.contains("NVIDIA Controller")) {
+                context.leftStickDeadzoneRadius = 0.07f;
+                context.rightStickDeadzoneRadius = 0.07f;
+
                // The big Nvidia button on the Shield controllers acts like a Search button. It
                // summons the Google Assistant on the Shield TV. On my Pixel 4, it seems to do
                // nothing, so we can hijack it to act like a mode button.
@@ -1294,6 +1292,28 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }
    }

+    private void toggleMouseEmulation(final GenericControllerContext context) {
+        if (context.mouseEmulationTimer != null) {
+            context.mouseEmulationTimer.cancel();
+            context.mouseEmulationTimer = null;
+        }
+
+        context.mouseEmulationActive = !context.mouseEmulationActive;
+        Toast.makeText(activityContext, "Mouse emulation is: " + (context.mouseEmulationActive ? "ON" : "OFF"), Toast.LENGTH_SHORT).show();
+
+        if (context.mouseEmulationActive) {
+            context.mouseEmulationTimer = new Timer();
+            context.mouseEmulationTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    // Send mouse movement events from analog sticks
+                    sendEmulatedMouseEvent(context.leftStickX, context.leftStickY);
+                    sendEmulatedMouseEvent(context.rightStickX, context.rightStickY);
+                }
+            }, 50, 50);
+        }
+    }
+
    @TargetApi(31)
    private boolean hasDualAmplitudeControlledRumbleVibrators(VibratorManager vm) {
        int[] vibratorIds = vm.getVibratorIds();
@@ -1342,13 +1362,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            }
        }

-        VibrationAttributes.Builder vibrationAttributes = new VibrationAttributes.Builder();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            vibrationAttributes.setUsage(VibrationAttributes.USAGE_MEDIA);
-        }
-
-        vm.vibrate(combo.combine(), vibrationAttributes.build());
+        vm.vibrate(combo.combine());
    }

    private void rumbleSingleVibrator(Vibrator vibrator, short lowFreqMotor, short highFreqMotor) {
@@ -1373,18 +1387,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            if (vibrator.hasAmplitudeControl()) {
                VibrationEffect effect = VibrationEffect.createOneShot(60000, simulatedAmplitude);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    VibrationAttributes vibrationAttributes = new VibrationAttributes.Builder()
-                            .setUsage(VibrationAttributes.USAGE_MEDIA)
-                            .build();
-                    vibrator.vibrate(effect, vibrationAttributes);
-                }
-                else {
-                    AudioAttributes audioAttributes = new AudioAttributes.Builder()
-                            .setUsage(AudioAttributes.USAGE_GAME)
-                            .build();
-                    vibrator.vibrate(effect, audioAttributes);
-                }
+                AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_GAME)
+                        .build();
+                vibrator.vibrate(effect, audioAttributes);
                return;
            }
        }
@@ -1394,13 +1400,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        long pwmPeriod = 20;
        long onTime = (long)((simulatedAmplitude / 255.0) * pwmPeriod);
        long offTime = pwmPeriod - onTime;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            VibrationAttributes vibrationAttributes = new VibrationAttributes.Builder()
-                    .setUsage(VibrationAttributes.USAGE_MEDIA)
-                    .build();
-            vibrator.vibrate(VibrationEffect.createWaveform(new long[]{0, onTime, offTime}, 0), vibrationAttributes);
-        }
-        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            AudioAttributes audioAttributes = new AudioAttributes.Builder()
                    .setUsage(AudioAttributes.USAGE_GAME)
                    .build();
@@ -1421,16 +1421,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            if (deviceContext.controllerNumber == controllerNumber) {
                foundMatchingDevice = true;

-                // Prefer the documented Android 12 rumble API which can handle dual vibrators on PS/Xbox controllers
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && deviceContext.vibratorManager != null) {
                    vibrated = true;
                    rumbleDualVibrators(deviceContext.vibratorManager, lowFreqMotor, highFreqMotor);
                }
-                // On Shield devices, we can use their special API to rumble Shield controllers
-                else if (sceManager.rumble(deviceContext.inputDevice, lowFreqMotor, highFreqMotor)) {
-                    vibrated = true;
-                }
-                // If all else fails, we have to try the old Vibrator API
                else if (deviceContext.vibrator != null) {
                    vibrated = true;
                    rumbleSingleVibrator(deviceContext.vibrator, lowFreqMotor, highFreqMotor);
@@ -1482,21 +1476,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        // If the button hasn't been down long enough, sleep for a bit before sending the up event
        // This allows "instant" button presses (like OUYA's virtual menu button) to work. This
        // path should not be triggered during normal usage.
-        int buttonDownTime = (int)(event.getEventTime() - event.getDownTime());
-        if (buttonDownTime < ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS)
+        if (SystemClock.uptimeMillis() - event.getDownTime() < ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS)
        {
-            // Since our sleep time is so short (<= 25 ms), it shouldn't cause a problem doing this
-            // in the UI thread.
+            // Since our sleep time is so short (10 ms), it shouldn't cause a problem doing this in the
+            // UI thread.
            try {
-                Thread.sleep(ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS - buttonDownTime);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-
-                // InterruptedException clears the thread's interrupt status. Since we can't
-                // handle that here, we will re-interrupt the thread to set the interrupt
-                // status back to true.
-                Thread.currentThread().interrupt();
-            }
+                Thread.sleep(ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS);
+            } catch (InterruptedException ignored) {}
        }

        switch (keyCode) {
@@ -1509,9 +1495,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            // Make sure it's real by checking that the key is actually down before taking
            // any action.
            if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-                    event.getEventTime() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS &&
+                    SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS &&
                    prefConfig.mouseEmulation) {
-                context.toggleMouseEmulation();
+                toggleMouseEmulation(context);
            }
            context.inputMap &= ~ControllerPacket.PLAY_FLAG;
            break;
@@ -1562,11 +1548,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            break;
        case KeyEvent.KEYCODE_BUTTON_L1:
            context.inputMap &= ~ControllerPacket.LB_FLAG;
-            context.lastLbUpTime = event.getEventTime();
+            context.lastLbUpTime = SystemClock.uptimeMillis();
            break;
        case KeyEvent.KEYCODE_BUTTON_R1:
            context.inputMap &= ~ControllerPacket.RB_FLAG;
-            context.lastRbUpTime = event.getEventTime();
+            context.lastRbUpTime = SystemClock.uptimeMillis();
            break;
        case KeyEvent.KEYCODE_BUTTON_THUMBL:
            context.inputMap &= ~ControllerPacket.LS_CLK_FLAG;
@@ -1602,6 +1588,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                context.inputMap &= ~ControllerPacket.BACK_FLAG;

                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
+
+                try {
+                    Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
+                } catch (InterruptedException ignored) {}
            }
        }

@@ -1616,6 +1606,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;

                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
+
+                try {
+                    Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
+                } catch (InterruptedException ignored) {}
            }
        }

@@ -1653,7 +1647,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        case KeyEvent.KEYCODE_BUTTON_START:
        case KeyEvent.KEYCODE_MENU:
            if (event.getRepeatCount() == 0) {
-                context.startDownTime = event.getEventTime();
+                context.startDownTime = SystemClock.uptimeMillis();
            }
            context.inputMap |= ControllerPacket.PLAY_FLAG;
            break;
@@ -1744,7 +1738,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        if (!context.hasSelect) {
            if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG) ||
                    (context.inputMap == ControllerPacket.PLAY_FLAG &&
-                            event.getEventTime() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+                            SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
            {
                context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
                context.inputMap |= ControllerPacket.BACK_FLAG;
@@ -1767,7 +1761,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            else {
                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG) ||
                        (context.inputMap == ControllerPacket.PLAY_FLAG &&
-                                event.getEventTime() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+                                SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
                {
                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
@@ -1858,7 +1852,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        usbDeviceContexts.put(controller.getControllerId(), context);
    }

-    class GenericControllerContext {
+    static class GenericControllerContext {
        public int id;
        public boolean external;

@@ -1882,38 +1876,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public short leftStickY = 0x0000;

        public boolean mouseEmulationActive;
+        public Timer mouseEmulationTimer;
        public short mouseEmulationLastInputMap;
-        public final int mouseEmulationReportPeriod = 50;
-
-        public final Runnable mouseEmulationRunnable = new Runnable() {
-            @Override
-            public void run() {
-                if (!mouseEmulationActive) {
-                    return;
-                }
-
-                // Send mouse movement events from analog sticks
-                sendEmulatedMouseEvent(leftStickX, leftStickY);
-                sendEmulatedMouseEvent(rightStickX, rightStickY);
-
-                // Requeue the callback
-                handler.postDelayed(this, mouseEmulationReportPeriod);
-            }
-        };
-
-        public void toggleMouseEmulation() {
-            handler.removeCallbacks(mouseEmulationRunnable);
-            mouseEmulationActive = !mouseEmulationActive;
-            Toast.makeText(activityContext, "Mouse emulation is: " + (mouseEmulationActive ? "ON" : "OFF"), Toast.LENGTH_SHORT).show();
-
-            if (mouseEmulationActive) {
-                handler.postDelayed(mouseEmulationRunnable, mouseEmulationReportPeriod);
-            }
-        }

        public void destroy() {
-            mouseEmulationActive = false;
-            handler.removeCallbacks(mouseEmulationRunnable);
+            if (mouseEmulationTimer != null) {
+                mouseEmulationTimer.cancel();
+                mouseEmulationTimer = null;
+            }
        }
    }

@@ -1921,7 +1891,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public String name;
        public VibratorManager vibratorManager;
        public Vibrator vibrator;
-        public InputDevice inputDevice;

        public int leftStickXAxis = -1;
        public int leftStickYAxis = -1;
@@ -1,20 +1,13 @@
 package com.limelight.binding.input;

-import android.annotation.TargetApi;
-import android.hardware.input.InputManager;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.InputDevice;
 import android.view.KeyEvent;

-import java.util.Arrays;
-
 /**
 * Class to translate a Android key code into the codes GFE is expecting
 * @author Diego Waxemberg
 * @author Cameron Gutman
 */
-public class KeyboardTranslator implements InputManager.InputDeviceListener {
+public class KeyboardTranslator {
    
    /**
     * GFE's prefix for every key code
@@ -55,92 +48,27 @@ public class KeyboardTranslator implements InputManager.InputDeviceListener {
    public static final int VK_QUOTE = 222;
    public static final int VK_PAUSE = 19;

-    private static class KeyboardMapping {
-        private final InputDevice device;
-        private final int[] deviceKeyCodeToQwertyKeyCode;
+    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;

-        @TargetApi(33)
-        public KeyboardMapping(InputDevice device) {
-            int maxKeyCode = KeyEvent.getMaxKeyCode();
-
-            this.device = device;
-            this.deviceKeyCodeToQwertyKeyCode = new int[maxKeyCode + 1];
-
-            // Any unmatched keycodes are treated as unknown
-            Arrays.fill(deviceKeyCodeToQwertyKeyCode, KeyEvent.KEYCODE_UNKNOWN);
-
-            for (int i = 0; i <= maxKeyCode; i++) {
-                int deviceKeyCode = device.getKeyCodeForKeyLocation(i);
-                if (deviceKeyCode != KeyEvent.KEYCODE_UNKNOWN) {
-                    deviceKeyCodeToQwertyKeyCode[deviceKeyCode] = i;
-                }
-            }
+            default:
+                return false;
        }
-
-        @TargetApi(33)
-        public int getDeviceKeyCodeForQwertyKeyCode(int qwertyKeyCode) {
-            return device.getKeyCodeForKeyLocation(qwertyKeyCode);
-        }
-
-        public int getQwertyKeyCodeForDeviceKeyCode(int deviceKeyCode) {
-            if (deviceKeyCode > KeyEvent.getMaxKeyCode()) {
-                return KeyEvent.KEYCODE_UNKNOWN;
-            }
-
-            return deviceKeyCodeToQwertyKeyCode[deviceKeyCode];
-        }
-    }
-
-    private final SparseArray<KeyboardMapping> keyboardMappings = new SparseArray<>();
-
-    public KeyboardTranslator() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            for (int deviceId : InputDevice.getDeviceIds()) {
-                InputDevice device = InputDevice.getDevice(deviceId);
-                if (device != null && device.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
-                    keyboardMappings.set(deviceId, new KeyboardMapping(device));
-                }
-            }
-        }
-    }
-
-    public boolean hasNormalizedMapping(int keycode, int deviceId) {
-        if (deviceId >= 0) {
-            KeyboardMapping mapping = keyboardMappings.get(deviceId);
-            if (mapping != null) {
-                // Try to map this device-specific keycode onto a QWERTY layout.
-                // GFE assumes incoming keycodes are from a QWERTY keyboard.
-                int qwertyKeyCode = mapping.getQwertyKeyCodeForDeviceKeyCode(keycode);
-                if (qwertyKeyCode != KeyEvent.KEYCODE_UNKNOWN) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
    }

    /**
     * Translates the given keycode and returns the GFE keycode
     * @param keycode the code to be translated
-     * @param deviceId InputDevice.getId() or -1 if unknown
     * @return a GFE keycode for the given keycode
     */
-    public short translate(int keycode, int deviceId) {
+    public static short translate(int keycode) {
        int translated;
-
-        // If a device ID was provided, look up the keyboard mapping
-        if (deviceId >= 0) {
-            KeyboardMapping mapping = keyboardMappings.get(deviceId);
-            if (mapping != null) {
-                // Try to map this device-specific keycode onto a QWERTY layout.
-                // GFE assumes incoming keycodes are from a QWERTY keyboard.
-                int qwertyKeyCode = mapping.getQwertyKeyCodeForDeviceKeyCode(keycode);
-                if (qwertyKeyCode != KeyEvent.KEYCODE_UNKNOWN) {
-                    keycode = qwertyKeyCode;
-                }
-            }
-        }
        
        // This is a poor man's mapping between Android key codes
        // and Windows VK_* codes. For all defined VK_ codes, see:
@@ -345,7 +273,20 @@ public class KeyboardTranslator implements InputManager.InputDeviceListener {
                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;
            }
        }
@@ -353,30 +294,4 @@ public class KeyboardTranslator implements InputManager.InputDeviceListener {
        return (short) ((KEY_PREFIX << 8) | translated);
    }

-    @Override
-    public void onInputDeviceAdded(int index) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            InputDevice device = InputDevice.getDevice(index);
-            if (device != null && device.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
-                keyboardMappings.put(index, new KeyboardMapping(device));
-            }
-        }
-    }
-
-    @Override
-    public void onInputDeviceRemoved(int index) {
-        keyboardMappings.remove(index);
-    }
-
-    @Override
-    public void onInputDeviceChanged(int index) {
-        keyboardMappings.remove(index);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            InputDevice device = InputDevice.getDevice(index);
-            if (device != null && device.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
-                keyboardMappings.set(index, new KeyboardMapping(device));
-            }
-        }
-    }
 }
@@ -2,9 +2,7 @@ package com.limelight.binding.input.capture;

 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.hardware.input.InputManager;
 import android.os.Build;
-import android.os.Handler;
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
@@ -14,13 +12,11 @@ import android.view.View;
 // pointer icon hiding behavior over our stream view just in case pointer capture
 // is unavailable on this system (ex: DeX, ChromeOS)
@TargetApi(Build.VERSION_CODES.O)
-public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptureProvider implements InputManager.InputDeviceListener {
-    private InputManager inputManager;
+public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptureProvider {
    private View targetView;

    public AndroidNativePointerCaptureProvider(Activity activity, View targetView) {
        super(activity, targetView);
-        this.inputManager = activity.getSystemService(InputManager.class);
        this.targetView = targetView;
    }

@@ -28,87 +24,25 @@ public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptu
        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
    }

-    // We only capture the pointer if we have a compatible InputDevice
-    // present. This is a workaround for an Android 12 regression causing
-    // incorrect mouse input when using the SPen.
-    // https://github.com/moonlight-stream/moonlight-android/issues/1030
-    private boolean hasCaptureCompatibleInputDevice() {
-        for (int id : InputDevice.getDeviceIds()) {
-            InputDevice device = InputDevice.getDevice(id);
-            if (device == null) {
-                continue;
-            }
-
-            // Skip touchscreens when considering compatible capture devices.
-            // Samsung devices on Android 12 will report a sec_touchpad device
-            // with SOURCE_TOUCHSCREEN, SOURCE_KEYBOARD, and SOURCE_MOUSE.
-            // Upon enabling pointer capture, that device will switch to
-            // SOURCE_KEYBOARD and SOURCE_TOUCHPAD.
-            // Only skip on non ChromeOS devices cause the ChromeOS pointer else
-            // gets disabled removing relative mouse capabilities
-            // on Chromebooks with touchscreens
-            if (device.supportsSource(InputDevice.SOURCE_TOUCHSCREEN) && !targetView.getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management")) {
-                continue;
-            }
-
-            if (device.supportsSource(InputDevice.SOURCE_MOUSE) ||
-                    device.supportsSource(InputDevice.SOURCE_MOUSE_RELATIVE) ||
-                    device.supportsSource(InputDevice.SOURCE_TOUCHPAD)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
    @Override
    public void enableCapture() {
        super.enableCapture();
-
-        // Listen for device events to enable/disable capture
-        inputManager.registerInputDeviceListener(this, null);
-
-        // Capture now if we have a capture-capable device
-        if (hasCaptureCompatibleInputDevice()) {
-            targetView.requestPointerCapture();
-        }
+        targetView.requestPointerCapture();
    }

    @Override
    public void disableCapture() {
        super.disableCapture();
-        inputManager.unregisterInputDeviceListener(this);
        targetView.releasePointerCapture();
    }

-    @Override
-    public void onWindowFocusChanged(boolean focusActive) {
-        if (!focusActive || !isCapturing) {
-            return;
-        }
-
-        // Recapture the pointer if focus was regained. On Android Q,
-        // we have to delay a bit before requesting capture because otherwise
-        // we'll hit the "requestPointerCapture called for a window that has no focus"
-        // error and it will not actually capture the cursor.
-        Handler h = new Handler();
-        h.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (hasCaptureCompatibleInputDevice()) {
-                    targetView.requestPointerCapture();
-                }
-            }
-        }, 500);
-    }
-
    @Override
    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
        // SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture.
        // SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture.
        // See https://developer.android.com/reference/android/view/View#requestPointerCapture()
        int eventSource = event.getSource();
-        return (eventSource == InputDevice.SOURCE_MOUSE_RELATIVE && event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) ||
+        return eventSource == InputDevice.SOURCE_MOUSE_RELATIVE ||
                (eventSource == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture());
    }

@@ -133,31 +67,4 @@ public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptu
        }
        return y;
    }
-
-    @Override
-    public void onInputDeviceAdded(int deviceId) {
-        // Check if we've added a capture-compatible device
-        if (!targetView.hasPointerCapture() && hasCaptureCompatibleInputDevice()) {
-            targetView.requestPointerCapture();
-        }
-    }
-
-    @Override
-    public void onInputDeviceRemoved(int deviceId) {
-        // Check if the capture-compatible device was removed
-        if (targetView.hasPointerCapture() && !hasCaptureCompatibleInputDevice()) {
-            targetView.releasePointerCapture();
-        }
-    }
-
-    @Override
-    public void onInputDeviceChanged(int deviceId) {
-        // Emulating a remove+add should be sufficient for our purposes.
-        //
-        // Note: This callback must be handled carefully because it can happen as a result of
-        // calling requestPointerCapture(). This can cause trackpad devices to gain SOURCE_MOUSE_RELATIVE
-        // and re-enter this callback.
-        onInputDeviceRemoved(deviceId);
-        onInputDeviceAdded(deviceId);
-    }
 }
@@ -2,8 +2,8 @@ package com.limelight.binding.input.capture;

 import android.app.Activity;

-import com.limelight.BuildConfig;
 import com.limelight.LimeLog;
+import com.limelight.LimelightBuildProps;
 import com.limelight.R;
 import com.limelight.binding.input.evdev.EvdevCaptureProviderShim;
 import com.limelight.binding.input.evdev.EvdevListener;
@@ -16,7 +16,7 @@ public class InputCaptureManager {
        }
        // LineageOS implemented broken NVIDIA capture extensions, so avoid using them on root builds.
        // See https://github.com/LineageOS/android_frameworks_base/commit/d304f478a023430f4712dbdc3ee69d9ad02cebd3
-        else if (!BuildConfig.ROOT_BUILD && ShieldCaptureProvider.isCaptureProviderSupported()) {
+        else if (!LimelightBuildProps.ROOT_BUILD && ShieldCaptureProvider.isCaptureProviderSupported()) {
            LimeLog.info("Using NVIDIA mouse capture extension");
            return new ShieldCaptureProvider(activity);
        }
@@ -33,6 +33,4 @@ public abstract class InputCaptureProvider {
    public float getRelativeAxisY(MotionEvent event) {
        return 0;
    }
-
-    public void onWindowFocusChanged(boolean focusActive) {}
 }
@@ -5,9 +5,9 @@ import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbDeviceConnection;
 import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
-import android.os.SystemClock;

 import com.limelight.LimeLog;
+import com.limelight.binding.video.MediaCodecHelper;

 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -37,9 +37,7 @@ public abstract class AbstractXboxController extends AbstractController {
                    // around when we call notifyDeviceAdded(), we won't be able to claim
                    // the controller number used by the original InputDevice.
                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    return;
-                }
+                } catch (InterruptedException e) {}

                // Report that we're added _before_ reporting input
                notifyDeviceAdded();
@@ -58,7 +56,7 @@ public abstract class AbstractXboxController extends AbstractController {

                    do {
                        // Read the next input state packet
-                        long lastMillis = SystemClock.uptimeMillis();
+                        long lastMillis = MediaCodecHelper.getMonotonicMillis();
                        res = connection.bulkTransfer(inEndpt, buffer, buffer.length, 3000);

                        // If we get a zero length response, treat it as an error
@@ -66,7 +64,7 @@ public abstract class AbstractXboxController extends AbstractController {
                            res = -1;
                        }

-                        if (res == -1 && SystemClock.uptimeMillis() - lastMillis < 1000) {
+                        if (res == -1 && MediaCodecHelper.getMonotonicMillis() - lastMillis < 1000) {
                            LimeLog.warning("Detected device I/O error");
                            AbstractXboxController.this.stop();
                            break;
@@ -20,7 +20,6 @@ import com.limelight.LimeLog;
 import com.limelight.R;
 import com.limelight.preferences.PreferenceConfiguration;

-import java.io.File;
 import java.util.ArrayList;

 public class UsbDriverService extends Service implements UsbDriverListener {
@@ -30,7 +29,6 @@ public class UsbDriverService extends Service implements UsbDriverListener {

    private UsbManager usbManager;
    private PreferenceConfiguration prefConfig;
-    private boolean started;

    private final UsbEventReceiver receiver = new UsbEventReceiver();
    private final UsbDriverBinder binder = new UsbDriverBinder();
@@ -38,7 +36,6 @@ public class UsbDriverService extends Service implements UsbDriverListener {
    private final ArrayList<AbstractController> controllers = new ArrayList<>();

    private UsbDriverListener listener;
-    private UsbDriverStateListener stateListener;
    private int nextDeviceId;

    @Override
@@ -96,11 +93,6 @@ public class UsbDriverService extends Service implements UsbDriverListener {
            else if (action.equals(ACTION_USB_PERMISSION)) {
                UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);

-                // Permission dialog is now closed
-                if (stateListener != null) {
-                    stateListener.onUsbPermissionPromptCompleted();
-                }
-
                // If we got this far, we've already found we're able to handle this device
                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
                    handleUsbDeviceState(device);
@@ -120,18 +112,6 @@ public class UsbDriverService extends Service implements UsbDriverListener {
                }
            }
        }
-
-        public void setStateListener(UsbDriverStateListener stateListener) {
-            UsbDriverService.this.stateListener = stateListener;
-        }
-
-        public void start() {
-            UsbDriverService.this.start();
-        }
-
-        public void stop() {
-            UsbDriverService.this.stop();
-        }
    }

    private void handleUsbDeviceState(UsbDevice device) {
@@ -141,29 +121,20 @@ public class UsbDriverService extends Service implements UsbDriverListener {
            if (!usbManager.hasPermission(device)) {
                // Let's ask for permission
                try {
-                    // Tell the state listener that we're about to display a permission dialog
-                    if (stateListener != null) {
-                        stateListener.onUsbPermissionPromptStarting();
-                    }
-
-                    int intentFlags = 0;
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                        // This PendingIntent must be mutable to allow the framework to populate EXTRA_DEVICE and EXTRA_PERMISSION_GRANTED.
-                        intentFlags |= PendingIntent.FLAG_MUTABLE;
-                    }
-
                    // This function is not documented as throwing any exceptions (denying access
                    // is indicated by calling the PendingIntent with a false result). However,
                    // Samsung Knox has some policies which block this request, but rather than
                    // just returning a false result or returning 0 enumerated devices,
                    // they throw an undocumented SecurityException from this call, crashing
                    // the whole app. :(
+                    int intentFlags = 0;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        // This PendingIntent must be mutable to allow the framework to populate EXTRA_DEVICE and EXTRA_PERMISSION_GRANTED.
+                        intentFlags |= PendingIntent.FLAG_MUTABLE;
+                    }
                    usbManager.requestPermission(device, PendingIntent.getBroadcast(UsbDriverService.this, 0, new Intent(ACTION_USB_PERMISSION), intentFlags));
                } catch (SecurityException e) {
                    Toast.makeText(this, this.getText(R.string.error_usb_prohibited), Toast.LENGTH_LONG).show();
-                    if (stateListener != null) {
-                        stateListener.onUsbPermissionPromptCompleted();
-                    }
                }
                return;
            }
@@ -184,9 +155,6 @@ public class UsbDriverService extends Service implements UsbDriverListener {
            else if (Xbox360Controller.canClaimDevice(device)) {
                controller = new Xbox360Controller(device, connection, nextDeviceId++, this);
            }
-            else if (Xbox360WirelessDongle.canClaimDevice(device)) {
-                controller = new Xbox360WirelessDongle(device, connection, nextDeviceId++, this);
-            }
            else {
                // Unreachable
                return;
@@ -252,51 +220,21 @@ public class UsbDriverService extends Service implements UsbDriverListener {
        }
    }

-    public static boolean kernelSupportsXbox360W() {
-        // Check if this kernel is 4.2+ to see if the xpad driver sets Xbox 360 wireless LEDs
-        // https://github.com/torvalds/linux/commit/75b7f05d2798ee3a1cc5bbdd54acd0e318a80396
-        String kernelVersion = System.getProperty("os.version");
-        if (kernelVersion != null) {
-            if (kernelVersion.startsWith("2.") || kernelVersion.startsWith("3.") ||
-                    kernelVersion.startsWith("4.0.") || kernelVersion.startsWith("4.1.")) {
-                // Even if LED devices are present, the driver won't set the initial LED state.
-                return false;
-            }
-        }
-
-        // We know we have a kernel that should set Xbox 360 wireless LEDs, but we still don't
-        // know if CONFIG_JOYSTICK_XPAD_LEDS was enabled during the kernel build. Unfortunately
-        // it's not possible to detect this reliably due to Android's app sandboxing. Reading
-        // /proc/config.gz and enumerating /sys/class/leds are both blocked by SELinux on any
-        // relatively modern device. We will assume that CONFIG_JOYSTICK_XPAD_LEDS=y on these
-        // kernels and users can override by using the settings option to claim all devices.
-        return true;
-    }
-
    public static boolean shouldClaimDevice(UsbDevice device, boolean claimAllAvailable) {
        return ((!kernelSupportsXboxOne() || !isRecognizedInputDevice(device) || claimAllAvailable) && XboxOneController.canClaimDevice(device)) ||
-                ((!isRecognizedInputDevice(device) || claimAllAvailable) && Xbox360Controller.canClaimDevice(device)) ||
-                // We must not call isRecognizedInputDevice() because wireless controllers don't share the same product ID as the dongle
-                ((!kernelSupportsXbox360W() || claimAllAvailable) && Xbox360WirelessDongle.canClaimDevice(device));
+                ((!isRecognizedInputDevice(device) || claimAllAvailable) && Xbox360Controller.canClaimDevice(device));
    }

-    private void start() {
-        if (started) {
-            return;
-        }
-
-        started = true;
+    @Override
+    public void onCreate() {
+        this.usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
+        this.prefConfig = PreferenceConfiguration.readPreferences(this);

        // Register for USB attach broadcasts and permission completions
        IntentFilter filter = new IntentFilter();
        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
        filter.addAction(ACTION_USB_PERMISSION);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            registerReceiver(receiver, filter, RECEIVER_NOT_EXPORTED);
-        }
-        else {
-            registerReceiver(receiver, filter);
-        }
+        registerReceiver(receiver, filter);

        // Enumerate existing devices
        for (UsbDevice dev : usbManager.getDeviceList().values()) {
@@ -307,16 +245,14 @@ public class UsbDriverService extends Service implements UsbDriverListener {
        }
    }

-    private void stop() {
-        if (!started) {
-            return;
-        }
-
-        started = false;
-
+    @Override
+    public void onDestroy() {
        // Stop the attachment receiver
        unregisterReceiver(receiver);

+        // Remove listeners
+        listener = null;
+
        // Stop all controllers
        while (controllers.size() > 0) {
            // Stop and remove the controller
@@ -324,28 +260,8 @@ public class UsbDriverService extends Service implements UsbDriverListener {
        }
    }

-    @Override
-    public void onCreate() {
-        this.usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
-        this.prefConfig = PreferenceConfiguration.readPreferences(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        stop();
-
-        // Remove listeners
-        listener = null;
-        stateListener = null;
-    }
-
    @Override
    public IBinder onBind(Intent intent) {
        return binder;
    }
-
-    public interface UsbDriverStateListener {
-        void onUsbPermissionPromptStarting();
-        void onUsbPermissionPromptCompleted();
-    }
 }
@@ -1,145 +0,0 @@
-package com.limelight.binding.input.driver;
-
-import android.hardware.usb.UsbConstants;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbDeviceConnection;
-import android.hardware.usb.UsbEndpoint;
-import android.hardware.usb.UsbInterface;
-import android.os.Build;
-import android.view.InputDevice;
-
-import com.limelight.LimeLog;
-
-import java.nio.ByteBuffer;
-
-public class Xbox360WirelessDongle extends AbstractController {
-    private UsbDevice device;
-    private UsbDeviceConnection connection;
-
-    private static final int XB360W_IFACE_SUBCLASS = 93;
-    private static final int XB360W_IFACE_PROTOCOL = 129; // Wireless only
-
-    private static final int[] SUPPORTED_VENDORS = {
-            0x045e, // Microsoft
-    };
-
-    public static boolean canClaimDevice(UsbDevice device) {
-        for (int supportedVid : SUPPORTED_VENDORS) {
-            if (device.getVendorId() == supportedVid &&
-                    device.getInterfaceCount() >= 1 &&
-                    device.getInterface(0).getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
-                    device.getInterface(0).getInterfaceSubclass() == XB360W_IFACE_SUBCLASS &&
-                    device.getInterface(0).getInterfaceProtocol() == XB360W_IFACE_PROTOCOL) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public Xbox360WirelessDongle(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
-        super(deviceId, listener, device.getVendorId(), device.getProductId());
-        this.device = device;
-        this.connection = connection;
-    }
-
-    private void sendLedCommandToEndpoint(UsbEndpoint endpoint, int controllerIndex) {
-        byte[] commandBuffer = {
-                0x00,
-                0x00,
-                0x08,
-                (byte) (0x40 + (2 + (controllerIndex % 4))),
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00};
-
-        int res = connection.bulkTransfer(endpoint, commandBuffer, commandBuffer.length, 3000);
-        if (res != commandBuffer.length) {
-            LimeLog.warning("LED set transfer failed: "+res);
-        }
-    }
-
-    private void sendLedCommandToInterface(UsbInterface iface, int controllerIndex) {
-        // Claim this interface to kick xpad off it (temporarily)
-        if (!connection.claimInterface(iface, true)) {
-            LimeLog.warning("Failed to claim interface: "+iface.getId());
-            return;
-        }
-
-        // Find the out endpoint for this interface
-        for (int i = 0; i < iface.getEndpointCount(); i++) {
-            UsbEndpoint endpt = iface.getEndpoint(i);
-            if (endpt.getDirection() == UsbConstants.USB_DIR_OUT) {
-                // Send the LED command
-                sendLedCommandToEndpoint(endpt, controllerIndex);
-                break;
-            }
-        }
-
-        // Release the interface to allow xpad to take over again
-        connection.releaseInterface(iface);
-    }
-
-    @Override
-    public boolean start() {
-        int controllerIndex = 0;
-
-        // On KitKat, there is a controller number associated with input devices.
-        // We can use this to approximate the likely controller number. This won't
-        // be completely accurate because there's no guarantee the order of interfaces
-        // matches the order that devices were enumerated by xpad, but it's probably
-        // better than nothing.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            for (int id : InputDevice.getDeviceIds()) {
-                InputDevice inputDev = InputDevice.getDevice(id);
-                if (inputDev == null) {
-                    // Device was removed while looping
-                    continue;
-                }
-
-                // Newer xpad versions use a special product ID (0x02a1) for controllers
-                // rather than copying the product ID of the dongle itself.
-                if (inputDev.getVendorId() == device.getVendorId() &&
-                        (inputDev.getProductId() == device.getProductId() ||
-                                inputDev.getProductId() == 0x02a1) &&
-                        inputDev.getControllerNumber() > 0) {
-                    controllerIndex = inputDev.getControllerNumber() - 1;
-                    break;
-                }
-            }
-        }
-
-        // Send LED commands on the out endpoint of each interface. There is one interface
-        // corresponding to each possible attached controller.
-        for (int i = 0; i < device.getInterfaceCount(); i++) {
-            UsbInterface iface = device.getInterface(i);
-
-            // Skip the non-input interfaces
-            if (iface.getInterfaceClass() != UsbConstants.USB_CLASS_VENDOR_SPEC ||
-                    iface.getInterfaceSubclass() != XB360W_IFACE_SUBCLASS ||
-                    iface.getInterfaceProtocol() != XB360W_IFACE_PROTOCOL) {
-                continue;
-            }
-
-            sendLedCommandToInterface(iface, controllerIndex++);
-        }
-
-        // "Fail" to give control back to the kernel driver
-        return false;
-    }
-
-    @Override
-    public void stop() {
-        // Nothing to do
-    }
-
-    @Override
-    public void rumble(short lowFreqMotor, short highFreqMotor) {
-        // Unreachable.
-    }
-}
@@ -3,12 +3,12 @@ package com.limelight.binding.input.evdev;

 import android.app.Activity;

-import com.limelight.BuildConfig;
+import com.limelight.LimelightBuildProps;
 import com.limelight.binding.input.capture.InputCaptureProvider;

 public class EvdevCaptureProviderShim {
    public static boolean isCaptureProviderSupported() {
-        return BuildConfig.ROOT_BUILD;
+        return LimelightBuildProps.ROOT_BUILD;
    }

    // We need to construct our capture provider using reflection because it isn't included in non-root builds
@@ -9,7 +9,6 @@ public interface EvdevListener {

    void mouseMove(int deltaX, int deltaY);
    void mouseButtonEvent(int buttonId, boolean down);
-    void mouseVScroll(byte amount);
-    void mouseHScroll(byte amount);
+    void mouseScroll(byte amount);
    void keyboardEvent(boolean buttonDown, short keyCode);
 }
@@ -1,12 +1,14 @@
 package com.limelight.binding.input.touch;

-import android.os.Handler;
-import android.os.Looper;
+import android.os.SystemClock;
 import android.view.View;

 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.MouseButtonPacket;

+import java.util.Timer;
+import java.util.TimerTask;
+
 public class AbsoluteTouchContext implements TouchContext {
    private int lastTouchDownX = 0;
    private int lastTouchDownY = 0;
@@ -19,43 +21,15 @@ public class AbsoluteTouchContext implements TouchContext {
    private boolean cancelled;
    private boolean confirmedLongPress;
    private boolean confirmedTap;
-
-    private final Runnable longPressRunnable = new Runnable() {
-        @Override
-        public void run() {
-            // This timer should have already expired, but cancel it just in case
-            cancelTapDownTimer();
-
-            // Switch from a left click to a right click after a long press
-            confirmedLongPress = true;
-            if (confirmedTap) {
-                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
-            }
-            conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
-        }
-    };
-
-    private final Runnable tapDownRunnable = new Runnable() {
-        @Override
-        public void run() {
-            // Start our tap
-            tapConfirmed();
-        }
-    };
+    private Timer longPressTimer;
+    private Timer tapDownTimer;
+    private float accumulatedScrollDelta;

    private final NvConnection conn;
    private final int actionIndex;
    private final View targetView;
-    private final Handler handler;

-    private final Runnable leftButtonUpRunnable = new Runnable() {
-        @Override
-        public void run() {
-            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
-        }
-    };
-
-    private static final int SCROLL_SPEED_FACTOR = 3;
+    private static final int SCROLL_SPEED_DIVISOR = 20;

    private static final int LONG_PRESS_TIME_THRESHOLD = 650;
    private static final int LONG_PRESS_DISTANCE_THRESHOLD = 30;
@@ -71,7 +45,6 @@ public class AbsoluteTouchContext implements TouchContext {
        this.conn = conn;
        this.actionIndex = actionIndex;
        this.targetView = view;
-        this.handler = new Handler(Looper.getMainLooper());
    }

    @Override
@@ -81,7 +54,7 @@ public class AbsoluteTouchContext implements TouchContext {
    }

    @Override
-    public boolean touchDownEvent(int eventX, int eventY, long eventTime, boolean isNewFinger)
+    public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
    {
        if (!isNewFinger) {
            // We don't handle finger transitions for absolute mode
@@ -90,8 +63,9 @@ public class AbsoluteTouchContext implements TouchContext {

        lastTouchLocationX = lastTouchDownX = eventX;
        lastTouchLocationY = lastTouchDownY = eventY;
-        lastTouchDownTime = eventTime;
+        lastTouchDownTime = SystemClock.uptimeMillis();
        cancelled = confirmedTap = confirmedLongPress = false;
+        accumulatedScrollDelta = 0;

        if (actionIndex == 0) {
            // Start the timers
@@ -118,7 +92,7 @@ public class AbsoluteTouchContext implements TouchContext {
    }

    @Override
-    public void touchUpEvent(int eventX, int eventY, long eventTime)
+    public void touchUpEvent(int eventX, int eventY)
    {
        if (cancelled) {
            return;
@@ -141,35 +115,80 @@ public class AbsoluteTouchContext implements TouchContext {
                // deadzone time. We'll need to send the touch down and up events now at the
                // original touch down position.
                tapConfirmed();
-
-                // Release the left mouse button in 100ms to allow for apps that use polling
-                // to detect mouse button presses.
-                handler.removeCallbacks(leftButtonUpRunnable);
-                handler.postDelayed(leftButtonUpRunnable, 100);
+                try {
+                    // FIXME: Sleeping on the main thread sucks
+                    Thread.sleep(50);
+                } catch (InterruptedException ignored) {}
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
            }
        }

        lastTouchLocationX = lastTouchUpX = eventX;
        lastTouchLocationY = lastTouchUpY = eventY;
-        lastTouchUpTime = eventTime;
+        lastTouchUpTime = SystemClock.uptimeMillis();
    }

-    private void startLongPressTimer() {
-        cancelLongPressTimer();
-        handler.postDelayed(longPressRunnable, LONG_PRESS_TIME_THRESHOLD);
+    private synchronized void startLongPressTimer() {
+        longPressTimer = new Timer(true);
+        longPressTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (AbsoluteTouchContext.this) {
+                    // Check if someone cancelled us
+                    if (longPressTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    longPressTimer = null;
+
+                    // This timer should have already expired, but cancel it just in case
+                    cancelTapDownTimer();
+
+                    // Switch from a left click to a right click after a long press
+                    confirmedLongPress = true;
+                    if (confirmedTap) {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                    }
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                }
+            }
+        }, LONG_PRESS_TIME_THRESHOLD);
    }

-    private void cancelLongPressTimer() {
-        handler.removeCallbacks(longPressRunnable);
+    private synchronized void cancelLongPressTimer() {
+        if (longPressTimer != null) {
+            longPressTimer.cancel();
+            longPressTimer = null;
+        }
    }

-    private void startTapDownTimer() {
-        cancelTapDownTimer();
-        handler.postDelayed(tapDownRunnable, TOUCH_DOWN_DEAD_ZONE_TIME_THRESHOLD);
+    private synchronized void startTapDownTimer() {
+        tapDownTimer = new Timer(true);
+        tapDownTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (AbsoluteTouchContext.this) {
+                    // Check if someone cancelled us
+                    if (tapDownTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    tapDownTimer = null;
+
+                    // Start our tap
+                    tapConfirmed();
+                }
+            }
+        }, TOUCH_DOWN_DEAD_ZONE_TIME_THRESHOLD);
    }

-    private void cancelTapDownTimer() {
-        handler.removeCallbacks(tapDownRunnable);
+    private synchronized void cancelTapDownTimer() {
+        if (tapDownTimer != null) {
+            tapDownTimer.cancel();
+            tapDownTimer = null;
+        }
    }

    private void tapConfirmed() {
@@ -190,7 +209,7 @@ public class AbsoluteTouchContext implements TouchContext {
    }

    @Override
-    public boolean touchMoveEvent(int eventX, int eventY, long eventTime)
+    public boolean touchMoveEvent(int eventX, int eventY)
    {
        if (cancelled) {
            return true;
@@ -209,7 +228,11 @@ public class AbsoluteTouchContext implements TouchContext {
            }
        }
        else if (actionIndex == 1) {
-            conn.sendMouseHighResScroll((short)((eventY - lastTouchLocationY) * SCROLL_SPEED_FACTOR));
+            accumulatedScrollDelta += (eventY - lastTouchLocationY) / (float)SCROLL_SPEED_DIVISOR;
+            if ((short)accumulatedScrollDelta != 0) {
+                conn.sendMouseHighResScroll((short)accumulatedScrollDelta);
+                accumulatedScrollDelta -= (short)accumulatedScrollDelta;
+            }
        }

        lastTouchLocationX = eventX;
@@ -1,12 +1,13 @@
 package com.limelight.binding.input.touch;

-import android.os.Handler;
-import android.os.Looper;
+import android.os.SystemClock;
 import android.view.View;

 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.MouseButtonPacket;
-import com.limelight.preferences.PreferenceConfiguration;
+
+import java.util.Timer;
+import java.util.TimerTask;

 public class RelativeTouchContext implements TouchContext {
    private int lastTouchX = 0;
@@ -18,6 +19,7 @@ public class RelativeTouchContext implements TouchContext {
    private boolean confirmedMove;
    private boolean confirmedDrag;
    private boolean confirmedScroll;
+    private Timer dragTimer;
    private double distanceMoved;
    private double xFactor, yFactor;
    private int pointerCount;
@@ -28,80 +30,22 @@ public class RelativeTouchContext implements TouchContext {
    private final int referenceWidth;
    private final int referenceHeight;
    private final View targetView;
-    private final PreferenceConfiguration prefConfig;
-    private final Handler handler;
-
-    private final Runnable dragTimerRunnable = new Runnable() {
-        @Override
-        public void run() {
-            // Check if someone already set move
-            if (confirmedMove) {
-                return;
-            }
-
-            // The drag should only be processed for the primary finger
-            if (actionIndex != maxPointerCountInGesture - 1) {
-                return;
-            }
-
-            // We haven't been cancelled before the timer expired so begin dragging
-            confirmedDrag = true;
-            conn.sendMouseButtonDown(getMouseButtonIndex());
-        }
-    };
-
-    // Indexed by MouseButtonPacket.BUTTON_XXX - 1
-    private final Runnable[] buttonUpRunnables = new Runnable[] {
-            new Runnable() {
-                @Override
-                public void run() {
-                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
-                }
-            },
-            new Runnable() {
-                @Override
-                public void run() {
-                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_MIDDLE);
-                }
-            },
-            new Runnable() {
-                @Override
-                public void run() {
-                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
-                }
-            },
-            new Runnable() {
-                @Override
-                public void run() {
-                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_X1);
-                }
-            },
-            new Runnable() {
-                @Override
-                public void run() {
-                    conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_X2);
-                }
-            }
-    };

    private static final int TAP_MOVEMENT_THRESHOLD = 20;
    private static final int TAP_DISTANCE_THRESHOLD = 25;
    private static final int TAP_TIME_THRESHOLD = 250;
    private static final int DRAG_TIME_THRESHOLD = 650;

-    private static final int SCROLL_SPEED_FACTOR = 5;
+    private static final int SCROLL_SPEED_DIVISOR = 20;

    public RelativeTouchContext(NvConnection conn, int actionIndex,
-                                int referenceWidth, int referenceHeight,
-                                View view, PreferenceConfiguration prefConfig)
+                                int referenceWidth, int referenceHeight, View view)
    {
        this.conn = conn;
        this.actionIndex = actionIndex;
        this.referenceWidth = referenceWidth;
        this.referenceHeight = referenceHeight;
        this.targetView = view;
-        this.prefConfig = prefConfig;
-        this.handler = new Handler(Looper.getMainLooper());
    }

    @Override
@@ -118,7 +62,7 @@ public class RelativeTouchContext implements TouchContext {
                yDelta <= TAP_MOVEMENT_THRESHOLD;
    }

-    private boolean isTap(long eventTime)
+    private boolean isTap()
    {
        if (confirmedDrag || confirmedMove || confirmedScroll) {
            return false;
@@ -131,7 +75,7 @@ public class RelativeTouchContext implements TouchContext {
            return false;
        }

-        long timeDelta = eventTime - originalTouchTime;
+        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
        return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
    }

@@ -146,7 +90,7 @@ public class RelativeTouchContext implements TouchContext {
    }

    @Override
-    public boolean touchDownEvent(int eventX, int eventY, long eventTime, boolean isNewFinger)
+    public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
    {
        // Get the view dimensions to scale inputs on this touch
        xFactor = referenceWidth / (double)targetView.getWidth();
@@ -157,7 +101,7 @@ public class RelativeTouchContext implements TouchContext {

        if (isNewFinger) {
            maxPointerCountInGesture = pointerCount;
-            originalTouchTime = eventTime;
+            originalTouchTime = SystemClock.uptimeMillis();
            cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
            distanceMoved = 0;

@@ -171,7 +115,7 @@ public class RelativeTouchContext implements TouchContext {
    }

    @Override
-    public void touchUpEvent(int eventX, int eventY, long eventTime)
+    public void touchUpEvent(int eventX, int eventY)
    {
        if (cancelled) {
            return;
@@ -186,29 +130,65 @@ public class RelativeTouchContext implements TouchContext {
            // Raise the button after a drag
            conn.sendMouseButtonUp(buttonIndex);
        }
-        else if (isTap(eventTime))
+        else if (isTap())
        {
            // Lower the mouse button
            conn.sendMouseButtonDown(buttonIndex);

-            // Release the mouse button in 100ms to allow for apps that use polling
-            // to detect mouse button presses.
-            Runnable buttonUpRunnable = buttonUpRunnables[buttonIndex - 1];
-            handler.removeCallbacks(buttonUpRunnable);
-            handler.postDelayed(buttonUpRunnable, 100);
+            // We need to sleep a bit here because some games
+            // do input detection by polling
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ignored) {}
+
+            // Raise the mouse button
+            conn.sendMouseButtonUp(buttonIndex);
        }
    }

-    private void startDragTimer() {
+    private synchronized void startDragTimer() {
+        // Cancel any existing drag timers
        cancelDragTimer();
-        handler.postDelayed(dragTimerRunnable, DRAG_TIME_THRESHOLD);
+
+        dragTimer = new Timer(true);
+        dragTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (RelativeTouchContext.this) {
+                    // Check if someone already set move
+                    if (confirmedMove) {
+                        return;
+                    }
+
+                    // The drag should only be processed for the primary finger
+                    if (actionIndex != maxPointerCountInGesture - 1) {
+                        return;
+                    }
+
+                    // Check if someone cancelled us
+                    if (dragTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    dragTimer = null;
+
+                    // We haven't been cancelled before the timer expired so begin dragging
+                    confirmedDrag = true;
+                    conn.sendMouseButtonDown(getMouseButtonIndex());
+                }
+            }
+        }, DRAG_TIME_THRESHOLD);
    }

-    private void cancelDragTimer() {
-        handler.removeCallbacks(dragTimerRunnable);
+    private synchronized void cancelDragTimer() {
+        if (dragTimer != null) {
+            dragTimer.cancel();
+            dragTimer = null;
+        }
    }

-    private void checkForConfirmedMove(int eventX, int eventY) {
+    private synchronized void checkForConfirmedMove(int eventX, int eventY) {
        // If we've already confirmed something, get out now
        if (confirmedMove || confirmedDrag) {
            return;
@@ -238,7 +218,7 @@ public class RelativeTouchContext implements TouchContext {
    }

    @Override
-    public boolean touchMoveEvent(int eventX, int eventY, long eventTime)
+    public boolean touchMoveEvent(int eventX, int eventY)
    {
        if (cancelled) {
            return true;
@@ -268,19 +248,12 @@ public class RelativeTouchContext implements TouchContext {

                if (pointerCount == 2) {
                    if (confirmedScroll) {
-                        conn.sendMouseHighResScroll((short)(deltaY * SCROLL_SPEED_FACTOR));
+                        deltaY /= SCROLL_SPEED_DIVISOR;
+
+                        conn.sendMouseHighResScroll((short) deltaY);
                    }
                } else {
-                    if (prefConfig.absoluteMouseMode) {
-                        conn.sendMouseMoveAsMousePosition(
-                                (short) deltaX,
-                                (short) deltaY,
-                                (short) targetView.getWidth(),
-                                (short) targetView.getHeight());
-                    }
-                    else {
-                        conn.sendMouseMove((short) deltaX, (short) deltaY);
-                    }
+                    conn.sendMouseMove((short) deltaX, (short) deltaY);
                }

                // If the scaling factor ended up rounding deltas to zero, wait until they are
@@ -3,9 +3,9 @@ package com.limelight.binding.input.touch;
 public interface TouchContext {
    int getActionIndex();
    void setPointerCount(int pointerCount);
-    boolean touchDownEvent(int eventX, int eventY, long eventTime, boolean isNewFinger);
-    boolean touchMoveEvent(int eventX, int eventY, long eventTime);
-    void touchUpEvent(int eventX, int eventY, long eventTime);
+    boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger);
+    boolean touchMoveEvent(int eventX, int eventY);
+    void touchUpEvent(int eventX, int eventY);
    void cancelTouch();
    boolean isCancelled();
 }
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.os.SystemClock;
 import android.view.MotionEvent;

 import java.util.ArrayList;
@@ -253,7 +254,7 @@ public class AnalogStick extends VirtualControllerElement {
        }
    }

-    private void updatePosition(long eventTime) {
+    private void updatePosition() {
        // get 100% way
        float complete = radius_complete - radius_analog_stick;

@@ -270,7 +271,7 @@ public class AnalogStick extends VirtualControllerElement {
        // We also release the deadzone if the user keeps the stick pressed for a bit to allow
        // them to make precise movements.
        stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE ||
-                eventTime - timeLastClick > timeoutDeadzone ||
+                SystemClock.uptimeMillis() - timeLastClick > timeoutDeadzone ||
                movement_radius > radius_dead_zone) ?
                STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;

@@ -305,12 +306,13 @@ public class AnalogStick extends VirtualControllerElement {
        // handle event depending on action
        switch (event.getActionMasked()) {
            // down event (touch event)
-            case MotionEvent.ACTION_DOWN: {
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_POINTER_DOWN: {
                // set to dead zoned, will be corrected in update position if necessary
                stick_state = STICK_STATE.MOVED_IN_DEAD_ZONE;
                // check for double click
                if (lastClickState == CLICK_STATE.SINGLE &&
-                        event.getEventTime() - timeLastClick <= timeoutDoubleClick) {
+                        timeLastClick + timeoutDoubleClick > SystemClock.uptimeMillis()) {
                    click_state = CLICK_STATE.DOUBLE;
                    notifyOnDoubleClick();
                } else {
@@ -318,14 +320,14 @@ public class AnalogStick extends VirtualControllerElement {
                    notifyOnClick();
                }
                // reset last click timestamp
-                timeLastClick = event.getEventTime();
+                timeLastClick = SystemClock.uptimeMillis();
                // set item pressed and update
                setPressed(true);
                break;
            }
            // up event (revoke touch)
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_POINTER_UP: {
                setPressed(false);
                break;
            }
@@ -333,7 +335,7 @@ public class AnalogStick extends VirtualControllerElement {

        if (isPressed()) {
            // when is pressed calculate new positions (will trigger movement if necessary)
-            updatePosition(event.getEventTime());
+            updatePosition();
        } else {
            stick_state = STICK_STATE.NO_MOVEMENT;
            notifyOnRevoke();
@@ -14,6 +14,8 @@ import android.view.MotionEvent;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;

 /**
 * This is a digital button on screen element. It is used to get click and double click user input.
@@ -41,16 +43,22 @@ public class DigitalButton extends VirtualControllerElement {
        void onRelease();
    }

-    private List<DigitalButtonListener> listeners = new ArrayList<>();
-    private String text = "";
-    private int icon = -1;
-    private long timerLongClickTimeout = 3000;
-    private final Runnable longClickRunnable = new Runnable() {
+    /**
+     *
+     */
+    private class TimerLongClickTimerTask extends TimerTask {
        @Override
        public void run() {
            onLongClickCallback();
        }
-    };
+    }
+
+    private List<DigitalButtonListener> listeners = new ArrayList<>();
+    private String text = "";
+    private int icon = -1;
+    private long timerLongClickTimeout = 3000;
+    private Timer timerLongClick = null;
+    private TimerLongClickTimerTask longClickTimerTask = null;

    private final Paint paint = new Paint();
    private final RectF rect = new RectF();
@@ -169,8 +177,18 @@ public class DigitalButton extends VirtualControllerElement {
            listener.onClick();
        }

-        virtualController.getHandler().removeCallbacks(longClickRunnable);
-        virtualController.getHandler().postDelayed(longClickRunnable, timerLongClickTimeout);
+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+            timerLongClick = null;
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+            longClickTimerTask = null;
+        }
+
+        timerLongClick = new Timer();
+        longClickTimerTask = new TimerLongClickTimerTask();
+        timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
    }

    private void onLongClickCallback() {
@@ -189,7 +207,14 @@ public class DigitalButton extends VirtualControllerElement {
        }

        // We may be called for a release without a prior click
-        virtualController.getHandler().removeCallbacks(longClickRunnable);
+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+            timerLongClick = null;
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+            longClickTimerTask = null;
+        }
    }

    @Override
@@ -200,7 +225,8 @@ public class DigitalButton extends VirtualControllerElement {
        int action = event.getActionMasked();

        switch (action) {
-            case MotionEvent.ACTION_DOWN: {
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_POINTER_DOWN: {
                movingButton = null;
                setPressed(true);
                onClickCallback();
@@ -215,7 +241,8 @@ public class DigitalButton extends VirtualControllerElement {
                return true;
            }
            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_POINTER_UP: {
                setPressed(false);
                onReleaseCallback();

@@ -162,6 +162,7 @@ public class DigitalPad extends VirtualControllerElement {
        // get masked (not specific to a pointer) action
        switch (event.getActionMasked()) {
            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_POINTER_DOWN:
            case MotionEvent.ACTION_MOVE: {
                direction = 0;

@@ -183,7 +184,8 @@ public class DigitalPad extends VirtualControllerElement {
                return true;
            }
            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_POINTER_UP: {
                direction = 0;
                newDirectionCallback(direction);
                invalidate();
@@ -5,20 +5,21 @@
 package com.limelight.binding.input.virtual_controller;

 import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
 import android.widget.Toast;

-import com.limelight.LimeLog;
 import com.limelight.R;
 import com.limelight.binding.input.ControllerHandler;
+import com.limelight.nvstream.NvConnection;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;

 public class VirtualController {
    public static class ControllerInputContext {
@@ -39,18 +40,13 @@ public class VirtualController {

    private static final boolean _PRINT_DEBUG_INFORMATION = false;

-    private final ControllerHandler controllerHandler;
-    private final Context context;
-    private final Handler handler;
-
-    private final Runnable delayedRetransmitRunnable = new Runnable() {
-        @Override
-        public void run() {
-            sendControllerInputContextInternal();
-        }
-    };
+    private ControllerHandler controllerHandler;
+    private Context context = null;

    private FrameLayout frame_layout = null;
+    private RelativeLayout relative_layout = null;
+
+    private Timer retransmitTimer;

    ControllerMode currentMode = ControllerMode.Active;
    ControllerInputContext inputContext = new ControllerInputContext();
@@ -63,7 +59,10 @@ public class VirtualController {
        this.controllerHandler = controllerHandler;
        this.frame_layout = layout;
        this.context = context;
-        this.handler = new Handler(Looper.getMainLooper());
+
+        relative_layout = new RelativeLayout(context);
+
+        frame_layout.addView(relative_layout);

        buttonConfigure = new Button(context);
        buttonConfigure.setAlpha(0.25f);
@@ -88,7 +87,7 @@ public class VirtualController {

                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();

-                buttonConfigure.invalidate();
+                relative_layout.invalidate();

                for (VirtualControllerElement element : elements) {
                    element.invalidate();
@@ -98,33 +97,32 @@ public class VirtualController {

    }

-    Handler getHandler() {
-        return handler;
-    }
-
    public void hide() {
-        for (VirtualControllerElement element : elements) {
-            element.setVisibility(View.INVISIBLE);
-        }
-
-        buttonConfigure.setVisibility(View.INVISIBLE);
+        retransmitTimer.cancel();
+        relative_layout.setVisibility(View.INVISIBLE);
    }

    public void show() {
-        for (VirtualControllerElement element : elements) {
-            element.setVisibility(View.VISIBLE);
-        }
+        relative_layout.setVisibility(View.VISIBLE);

-        buttonConfigure.setVisibility(View.VISIBLE);
+        // HACK: GFE sometimes discards gamepad packets when they are received
+        // very shortly after another. This can be critical if an axis zeroing packet
+        // is lost and causes an analog stick to get stuck. To avoid this, we send
+        // a gamepad input packet every 100 ms to ensure any loss can be recovered.
+        retransmitTimer = new Timer("OSC timer", true);
+        retransmitTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                sendControllerInputContext();
+            }
+        }, 100, 100);
    }

    public void removeElements() {
        for (VirtualControllerElement element : elements) {
-            frame_layout.removeView(element);
+            relative_layout.removeView(element);
        }
        elements.clear();
-
-        frame_layout.removeView(buttonConfigure);
    }

    public void setOpacity(int opacity) {
@@ -136,10 +134,10 @@ public class VirtualController {

    public void addElement(VirtualControllerElement element, int x, int y, int width, int height) {
        elements.add(element);
-        FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(width, height);
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
        layoutParams.setMargins(x, y, 0, 0);

-        frame_layout.addView(element, layoutParams);
+        relative_layout.addView(element, layoutParams);
    }

    public List<VirtualControllerElement> getElements() {
@@ -148,20 +146,23 @@ public class VirtualController {

    private static final void _DBG(String text) {
        if (_PRINT_DEBUG_INFORMATION) {
-            LimeLog.info("VirtualController: " + text);
+            System.out.println("VirtualController: " + text);
        }
    }

    public void refreshLayout() {
+        relative_layout.removeAllViews();
        removeElements();

        DisplayMetrics screen = context.getResources().getDisplayMetrics();

        int buttonSize = (int)(screen.heightPixels*0.06f);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(buttonSize, buttonSize);
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(buttonSize, buttonSize);
+        params.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
+        params.addRule(RelativeLayout.ALIGN_PARENT_TOP, RelativeLayout.TRUE);
        params.leftMargin = 15;
        params.topMargin = 15;
-        frame_layout.addView(buttonConfigure, params);
+        relative_layout.addView(buttonConfigure, params);

        // Start with the default layout
        VirtualControllerConfigurationLoader.createDefaultLayout(this, context);
@@ -178,7 +179,7 @@ public class VirtualController {
        return inputContext;
    }

-    private void sendControllerInputContextInternal() {
+    void sendControllerInputContext() {
        _DBG("INPUT_MAP + " + inputContext.inputMap);
        _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
        _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
@@ -197,19 +198,4 @@ public class VirtualController {
            );
        }
    }
-
-    void sendControllerInputContext() {
-        // Cancel retransmissions of prior gamepad inputs
-        handler.removeCallbacks(delayedRetransmitRunnable);
-
-        sendControllerInputContextInternal();
-
-        // HACK: GFE sometimes discards gamepad packets when they are received
-        // very shortly after another. This can be critical if an axis zeroing packet
-        // is lost and causes an analog stick to get stuck. To avoid this, we retransmit
-        // the gamepad state a few times unless another input event happens before then.
-        handler.postDelayed(delayedRetransmitRunnable, 25);
-        handler.postDelayed(delayedRetransmitRunnable, 50);
-        handler.postDelayed(delayedRetransmitRunnable, 75);
-    }
 }
@@ -40,31 +40,27 @@ public class VirtualControllerConfigurationLoader {
                VirtualController.ControllerInputContext inputContext =
                        controller.getControllerInputContext();

-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_LEFT) != 0) {
+                if (direction == DigitalPad.DIGITAL_PAD_DIRECTION_NO_DIRECTION) {
+                    inputContext.inputMap &= ~ControllerPacket.LEFT_FLAG;
+                    inputContext.inputMap &= ~ControllerPacket.RIGHT_FLAG;
+                    inputContext.inputMap &= ~ControllerPacket.UP_FLAG;
+                    inputContext.inputMap &= ~ControllerPacket.DOWN_FLAG;
+
+                    controller.sendControllerInputContext();
+                    return;
+                }
+                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_LEFT) > 0) {
                    inputContext.inputMap |= ControllerPacket.LEFT_FLAG;
                }
-                else {
-                    inputContext.inputMap &= ~ControllerPacket.LEFT_FLAG;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_RIGHT) != 0) {
+                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_RIGHT) > 0) {
                    inputContext.inputMap |= ControllerPacket.RIGHT_FLAG;
                }
-                else {
-                    inputContext.inputMap &= ~ControllerPacket.RIGHT_FLAG;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_UP) != 0) {
+                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_UP) > 0) {
                    inputContext.inputMap |= ControllerPacket.UP_FLAG;
                }
-                else {
-                    inputContext.inputMap &= ~ControllerPacket.UP_FLAG;
-                }
-                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_DOWN) != 0) {
+                if ((direction & DigitalPad.DIGITAL_PAD_DIRECTION_DOWN) > 0) {
                    inputContext.inputMap |= ControllerPacket.DOWN_FLAG;
                }
-                else {
-                    inputContext.inputMap &= ~ControllerPacket.DOWN_FLAG;
-                }
-
                controller.sendControllerInputContext();
            }
        });
@@ -12,7 +12,7 @@ import android.graphics.Paint;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.RelativeLayout;

 import org.json.JSONException;
 import org.json.JSONObject;
@@ -72,7 +72,7 @@ public abstract class VirtualControllerElement extends View {
        int newPos_x = (int) getX() + x - pressed_x;
        int newPos_y = (int) getY() + y - pressed_y;

-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();

        layoutParams.leftMargin = newPos_x > 0 ? newPos_x : 0;
        layoutParams.topMargin = newPos_y > 0 ? newPos_y : 0;
@@ -83,7 +83,7 @@ public abstract class VirtualControllerElement extends View {
    }

    protected void resizeElement(int pressed_x, int pressed_y, int width, int height) {
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();

        int newHeight = height + (startSize_y - pressed_y);
        int newWidth = width + (startSize_x - pressed_x);
@@ -223,21 +223,13 @@ public abstract class VirtualControllerElement extends View {

    @Override
    public boolean onTouchEvent(MotionEvent event) {
-        // Ignore secondary touches on controls
-        //
-        // NB: We can get an additional pointer down if the user touches a non-StreamView area
-        // while also touching an OSC control, even if that pointer down doesn't correspond to
-        // an area of the OSC control.
-        if (event.getActionIndex() != 0) {
-            return true;
-        }
-
        if (virtualController.getControllerMode() == VirtualController.ControllerMode.Active) {
            return onElementTouchEvent(event);
        }

        switch (event.getActionMasked()) {
-            case MotionEvent.ACTION_DOWN: {
+            case MotionEvent.ACTION_DOWN:
+            case MotionEvent.ACTION_POINTER_DOWN: {
                position_pressed_x = event.getX();
                position_pressed_y = event.getY();
                startSize_x = getWidth();
@@ -275,7 +267,8 @@ public abstract class VirtualControllerElement extends View {
                return true;
            }
            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_POINTER_UP: {
                actionCancel();
                return true;
            }
@@ -323,7 +316,7 @@ public abstract class VirtualControllerElement extends View {
    public JSONObject getConfiguration() throws JSONException {
        JSONObject configuration = new JSONObject();

-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();

        configuration.put("LEFT", layoutParams.leftMargin);
        configuration.put("TOP", layoutParams.topMargin);
@@ -334,7 +327,7 @@ public abstract class VirtualControllerElement extends View {
    }

    public void loadConfiguration(JSONObject configuration) throws JSONException {
-        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();

        layoutParams.leftMargin = configuration.getInt("LEFT");
        layoutParams.topMargin = configuration.getInt("TOP");
@@ -14,7 +14,6 @@ import android.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.ConfigurationInfo;
-import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaCodecInfo.CodecCapabilities;
@@ -32,21 +31,20 @@ public class MediaCodecHelper {
    private static final List<String> blacklistedDecoderPrefixes;
    private static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
    private static final List<String> blacklistedAdaptivePlaybackPrefixes;
+    private static final List<String> deprioritizedHevcDecoders;
    private static final List<String> baselineProfileHackPrefixes;
    private static final List<String> directSubmitPrefixes;
    private static final List<String> constrainedHighProfilePrefixes;
    private static final List<String> whitelistedHevcDecoders;
    private static final List<String> refFrameInvalidationAvcPrefixes;
    private static final List<String> refFrameInvalidationHevcPrefixes;
-    private static final List<String> useFourSlicesPrefixes;
+    private static final List<String> blacklisted49FpsDecoderPrefixes;
+    private static final List<String> blacklisted59FpsDecoderPrefixes;
    private static final List<String> qualcommDecoderPrefixes;
    private static final List<String> kirinDecoderPrefixes;
    private static final List<String> exynosDecoderPrefixes;
-    private static final List<String> amlogicDecoderPrefixes;
-    private static final List<String> knownVendorLowLatencyOptions;

-    public static final boolean SHOULD_BYPASS_SOFTWARE_BLOCK =
-            Build.HARDWARE.equals("ranchu") || Build.HARDWARE.equals("cheets") || Build.BRAND.equals("Android-x86");
+    public static final boolean IS_EMULATOR = Build.HARDWARE.equals("ranchu") || Build.HARDWARE.equals("cheets");

    private static boolean isLowEndSnapdragon = false;
    private static boolean isAdreno620 = false;
@@ -72,10 +70,7 @@ public class MediaCodecHelper {

    static {
        refFrameInvalidationAvcPrefixes = new LinkedList<>();
-
        refFrameInvalidationHevcPrefixes = new LinkedList<>();
-        refFrameInvalidationHevcPrefixes.add("omx.exynos");
-        refFrameInvalidationHevcPrefixes.add("c2.exynos");

        // Qualcomm and NVIDIA may be added at runtime
    }
@@ -87,18 +82,18 @@ public class MediaCodecHelper {
    static {
        blacklistedDecoderPrefixes = new LinkedList<>();

-        // Blacklist software decoders that don't support H264 high profile except on systems
-        // that are expected to only have software decoders (like emulators).
-        if (!SHOULD_BYPASS_SOFTWARE_BLOCK) {
+        // Blacklist software decoders that don't support H264 high profile,
+        // but exclude the official AOSP and CrOS emulator from this restriction.
+        if (!IS_EMULATOR) {
            blacklistedDecoderPrefixes.add("omx.google");
            blacklistedDecoderPrefixes.add("AVCDecoder");
+        }

-            // We want to avoid ffmpeg decoders since they're usually software decoders,
-            // but we'll defer to the Android 10 isSoftwareOnly() API on newer devices
-            // to determine if we should use these or not.
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                blacklistedDecoderPrefixes.add("OMX.ffmpeg");
-            }
+        // We want to avoid ffmpeg decoders since they're software decoders,
+        // but on Android-x86 they might be all we have (and also relatively
+        // performant on a modern x86 processor).
+        if (!Build.BRAND.equals("Android-x86")) {
+            blacklistedDecoderPrefixes.add("OMX.ffmpeg");
        }

        // Force these decoders disabled because:
@@ -142,26 +137,24 @@ public class MediaCodecHelper {
        // Exynos seems to be the only HEVC decoder that works reliably
        whitelistedHevcDecoders.add("omx.exynos");

-        // On Darcy (Shield 2017), HEVC runs fine with no fixups required. For some reason,
-        // other X1 implementations require bitstream fixups. However, since numReferenceFrames
-        // has been supported in GFE since late 2017, we'll go ahead and enable HEVC for all
-        // device models.
-        //
-        // NVIDIA does partial HEVC acceleration on the Shield Tablet. I don't know
-        // whether the performance is good enough to use for streaming, but they're
-        // using the same omx.nvidia.h265.decode name as the Shield TV which has a
-        // fully accelerated HEVC pipeline. AFAIK, the only K1 devices with this
-        // partially accelerated HEVC decoder are the Shield Tablet and Xiaomi MiPad,
-        // so I'll check for those here.
-        //
-        // In case there are some that I missed, I will also exclude pre-Oreo OSes since
-        // only Shield ATV got an Oreo update and any newer Tegra devices will not ship
-        // with an old OS like Nougat.
-        if (!Build.DEVICE.equalsIgnoreCase("shieldtablet") &&
-                !Build.DEVICE.equalsIgnoreCase("mocha") &&
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        // On Darcy (Shield 2017), HEVC runs fine with no fixups required.
+        // For some reason, other X1 implementations require bitstream fixups.
+        if (Build.DEVICE.equalsIgnoreCase("darcy")) {
            whitelistedHevcDecoders.add("omx.nvidia");
        }
+        else {
+            // TODO: This needs a similar fixup to the Tegra 3 otherwise it buffers 16 frames
+        }
+
+        // Older Sony ATVs (SVP-DTV15) have broken MediaTek codecs (decoder hangs after rendering the first frame).
+        // I know the Fire TV 2 and 3 works, so I'll whitelist Amazon devices which seem to actually be tested.
+        if (Build.MANUFACTURER.equalsIgnoreCase("Amazon")) {
+            whitelistedHevcDecoders.add("omx.mtk");
+
+            // This broke at some point on the Fire TV 3 and now the decoder
+            // never produces any output frames.
+            //whitelistedHevcDecoders.add("omx.amlogic");
+        }

        // Plot twist: On newer Sony devices (BRAVIA_ATV2, BRAVIA_ATV3_4K, BRAVIA_UR1_4K) the H.264 decoder crashes
        // on several configurations (> 60 FPS and 1440p) that work with HEVC, so we'll whitelist those devices for HEVC.
@@ -171,17 +164,8 @@ public class MediaCodecHelper {

        // Amlogic requires 1 reference frame for HEVC to avoid hanging. Since it's been years
        // since GFE added support for maxNumReferenceFrames, we'll just enable all Amlogic SoCs
-        // running Android 9 or later.
-        //
-        // NB: We don't do this on Sabrina (GCWGTV) because H.264 is lower latency when we use
-        // vendor.low-latency.enable. We will still use HEVC if decoderCanMeetPerformancePointWithHevcAndNotAvc()
-        // determines it's the only way to meet the performance requirements.
-        //
-        // With the Android 12 update, Sabrina now uses HEVC (with RFI) based upon FEATURE_LowLatency
-        // support, which provides equivalent latency to H.264 now.
-        //
-        // FIXME: Should we do this for all Amlogic S905X SoCs?
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !Build.DEVICE.equalsIgnoreCase("sabrina")) {
+        // running Android 9 or later. HEVC is much lower latency than H.264 on Sabrina (S905X2).
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            whitelistedHevcDecoders.add("omx.amlogic");
        }

@@ -203,24 +187,29 @@ public class MediaCodecHelper {
    }

    static {
-        useFourSlicesPrefixes = new LinkedList<>();
+        deprioritizedHevcDecoders = new LinkedList<>();

-        // Software decoders will use 4 slices per frame to allow for slice multithreading
-        useFourSlicesPrefixes.add("omx.google");
-        useFourSlicesPrefixes.add("AVCDecoder");
-        useFourSlicesPrefixes.add("omx.ffmpeg");
-        useFourSlicesPrefixes.add("c2.android");
+        // These are decoders that work but aren't used by default for various reasons.

-        // Old Qualcomm decoders are detected at runtime
+        // Qualcomm is currently the only decoders in this group.
    }

    static {
-        knownVendorLowLatencyOptions = new LinkedList<>();
+        blacklisted49FpsDecoderPrefixes = new LinkedList<>();
+        blacklisted59FpsDecoderPrefixes = new LinkedList<>();

-        knownVendorLowLatencyOptions.add("vendor.qti-ext-dec-low-latency.enable");
-        knownVendorLowLatencyOptions.add("vendor.hisi-ext-low-latency-video-dec.video-scene-for-low-latency-req");
-        knownVendorLowLatencyOptions.add("vendor.rtc-ext-dec-low-latency.enable");
-        knownVendorLowLatencyOptions.add("vendor.low-latency.enable");
+        // We see a bunch of crashes on MediaTek Android TVs running
+        // at 49 FPS (PAL 50 Hz - 1). Blacklist this frame rate for
+        // these devices and hope they fix it in Pie.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            blacklisted49FpsDecoderPrefixes.add("omx.mtk");
+
+            // 59 FPS also seems to crash on the Sony Bravia TV ATV3 model.
+            // Blacklist that frame rate on these devices too.
+            if (Build.DEVICE.startsWith("BRAVIA_ATV3")) {
+                blacklisted59FpsDecoderPrefixes.add("omx.mtk");
+            }
+        }
    }

    static {
@@ -234,21 +223,12 @@ public class MediaCodecHelper {
        kirinDecoderPrefixes = new LinkedList<>();

        kirinDecoderPrefixes.add("omx.hisi");
-        kirinDecoderPrefixes.add("c2.hisi"); // Unconfirmed
    }

    static {
        exynosDecoderPrefixes = new LinkedList<>();

        exynosDecoderPrefixes.add("omx.exynos");
-        exynosDecoderPrefixes.add("c2.exynos");
-    }
-
-    static {
-        amlogicDecoderPrefixes = new LinkedList<>();
-
-        amlogicDecoderPrefixes.add("omx.amlogic");
-        amlogicDecoderPrefixes.add("c2.amlogic"); // Unconfirmed
    }

    private static boolean isPowerVR(String glRenderer) {
@@ -309,40 +289,6 @@ public class MediaCodecHelper {
            return;
        }

-        // Older Sony ATVs (SVP-DTV15) have broken MediaTek codecs (decoder hangs after rendering the first frame).
-        // I know the Fire TV 2 and 3 works, so I'll whitelist Amazon devices which seem to actually be tested.
-        // We still have to check Build.MANUFACTURER to catch Amazon Fire tablets.
-        if (context.getPackageManager().hasSystemFeature("amazon.hardware.fire_tv") ||
-                Build.MANUFACTURER.equalsIgnoreCase("Amazon")) {
-            // HEVC and RFI have been confirmed working on Fire TV 2, Fire TV Stick 2, Fire TV 4K Max,
-            // Fire HD 8 2020, and Fire HD 8 2022 models.
-            //
-            // This is probably a good enough sample to conclude that all MediaTek Fire OS devices
-            // are likely to be okay.
-            whitelistedHevcDecoders.add("omx.mtk");
-            refFrameInvalidationHevcPrefixes.add("omx.mtk");
-            refFrameInvalidationHevcPrefixes.add("c2.mtk");
-
-            // This requires setting vdec-lowlatency on the Fire TV 3, otherwise the decoder
-            // never produces any output frames. See comment above for details on why we only
-            // do this for Fire TV devices.
-            whitelistedHevcDecoders.add("omx.amlogic");
-
-            // Fire TV 3 seems to produce random artifacts on HEVC streams after packet loss.
-            // Enabling RFI turns these artifacts into full decoder output hangs, so let's not enable
-            // that for Fire OS 6 Amlogic devices. We will leave HEVC enabled because that's the only
-            // way these devices can hit 4K. Hopefully this is just a problem with the BSP used in
-            // the Fire OS 6 Amlogic devices, so we will leave this enabled for Fire OS 7+.
-            //
-            // Apart from a few TV models, the main Amlogic-based Fire TV devices are the Fire TV
-            // Cubes and Fire TV 3. This check will exclude the Fire TV 3 and Fire TV Cube 1, but
-            // allow the newer Fire TV Cubes to use HEVC RFI.
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                refFrameInvalidationHevcPrefixes.add("omx.amlogic");
-                refFrameInvalidationHevcPrefixes.add("c2.amlogic");
-            }
-        }
-
        ActivityManager activityManager =
                (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
        ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
@@ -354,24 +300,19 @@ public class MediaCodecHelper {

            // Tegra K1 and later can do reference frame invalidation properly
            if (configInfo.reqGlEsVersion >= 0x30000) {
-                LimeLog.info("Added omx.nvidia/c2.nvidia to reference frame invalidation support list");
+                LimeLog.info("Added omx.nvidia to AVC reference frame invalidation support list");
                refFrameInvalidationAvcPrefixes.add("omx.nvidia");

-                // Exclude HEVC RFI on Pixel C and Tegra devices prior to Android 11. Misbehaving RFI
-                // on these devices can cause hundreds of milliseconds of latency, so it's not worth
-                // using it unless we're absolutely sure that it will not cause increased latency.
-                if (!Build.DEVICE.equalsIgnoreCase("dragon") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    refFrameInvalidationHevcPrefixes.add("omx.nvidia");
-                }
-
-                refFrameInvalidationAvcPrefixes.add("c2.nvidia"); // Unconfirmed
-                refFrameInvalidationHevcPrefixes.add("c2.nvidia"); // Unconfirmed
-
-                LimeLog.info("Added omx.qcom/c2.qti to reference frame invalidation support list");
+                LimeLog.info("Added omx.qcom/c2.qti to AVC reference frame invalidation support list");
                refFrameInvalidationAvcPrefixes.add("omx.qcom");
-                refFrameInvalidationHevcPrefixes.add("omx.qcom");
                refFrameInvalidationAvcPrefixes.add("c2.qti");
-                refFrameInvalidationHevcPrefixes.add("c2.qti");
+
+                // Prior to M, we were tricking the decoder into using baseline profile, which
+                // won't support RFI properly.
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    LimeLog.info("Added omx.intel to AVC reference frame invalidation support list");
+                    refFrameInvalidationAvcPrefixes.add("omx.intel");
+                }
            }

            // Qualcomm's early HEVC decoders break hard on our HEVC stream. The best check to
@@ -383,15 +324,16 @@ public class MediaCodecHelper {
            // (see comment on isGLES31SnapdragonRenderer).
            //
            if (isGLES31SnapdragonRenderer(glRenderer)) {
-                LimeLog.info("Added omx.qcom/c2.qti to HEVC decoders based on GLES 3.1+ support");
-                whitelistedHevcDecoders.add("omx.qcom");
-                whitelistedHevcDecoders.add("c2.qti");
+                // We prefer reference frame invalidation support (which is only doable on AVC on
+                // older Qualcomm chips) vs. enabling HEVC by default. The user can override using the settings
+                // to force HEVC on. If HDR or mobile data will be used, we'll override this and use
+                // HEVC anyway.
+                LimeLog.info("Added omx.qcom/c2.qti to deprioritized HEVC decoders based on GLES 3.1+ support");
+                deprioritizedHevcDecoders.add("omx.qcom");
+                deprioritizedHevcDecoders.add("c2.qti");
            }
            else {
                blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevc");
-
-                // These older decoders need 4 slices per frame for best performance
-                useFourSlicesPrefixes.add("omx.qcom");
            }

            // Older MediaTek SoCs have issues with HEVC rendering but the newer chips with
@@ -405,9 +347,8 @@ public class MediaCodecHelper {
                // decoder hangs on the newer GE8100, GE8300, and GE8320 GPUs, so we limit it to the
                // Series6XT GPUs where we know it works.
                if (glRenderer.contains("GX6")) {
-                    LimeLog.info("Added omx.mtk/c2.mtk to RFI list for HEVC");
+                    LimeLog.info("Added omx.mtk to RFI list for HEVC");
                    refFrameInvalidationHevcPrefixes.add("omx.mtk");
-                    refFrameInvalidationHevcPrefixes.add("c2.mtk");
                }
            }
        }
@@ -432,6 +373,10 @@ public class MediaCodecHelper {
        return false;
    }

+    public static long getMonotonicMillis() {
+        return System.nanoTime() / 1000000L;
+    }
+
    private static boolean decoderSupportsAndroidRLowLatency(MediaCodecInfo decoderInfo, String mimeType) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
            try {
@@ -448,35 +393,6 @@ public class MediaCodecHelper {
        return false;
    }

-    private static boolean decoderSupportsKnownVendorLowLatencyOption(String decoderName) {
-        // It's only possible to probe vendor parameters on Android 12 and above.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            MediaCodec testCodec = null;
-            try {
-                // Unfortunately we have to create an actual codec instance to get supported options.
-                testCodec = MediaCodec.createByCodecName(decoderName);
-
-                // See if any of the vendor parameters match ones we know about
-                for (String supportedOption : testCodec.getSupportedVendorParameters()) {
-                    for (String knownLowLatencyOption : knownVendorLowLatencyOptions) {
-                        if (supportedOption.equalsIgnoreCase(knownLowLatencyOption)) {
-                            LimeLog.info(decoderName + " supports known low latency option: " + supportedOption);
-                            return true;
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                // Tolerate buggy codecs
-                e.printStackTrace();
-            } finally {
-                if (testCodec != null) {
-                    testCodec.release();
-                }
-            }
-        }
-        return false;
-    }
-
    private static boolean decoderSupportsMaxOperatingRate(String decoderName) {
        // Operate at maximum rate to lower latency as much as possible on
        // some Qualcomm platforms. We could also set KEY_PRIORITY to 0 (realtime)
@@ -492,119 +408,41 @@ public class MediaCodecHelper {
                !isAdreno620;
    }

-    public static boolean setDecoderLowLatencyOptions(MediaFormat videoFormat, MediaCodecInfo decoderInfo, int tryNumber) {
-        // Options here should be tried in the order of most to least risky. The decoder will use
-        // the first MediaFormat that doesn't fail in configure().
-
-        boolean setNewOption = false;
-
-        if (tryNumber < 1) {
-            // Official Android 11+ low latency option (KEY_LOW_LATENCY).
-            videoFormat.setInteger("low-latency", 1);
-            setNewOption = true;
-
-            // If this decoder officially supports FEATURE_LowLatency, we will just use that alone
-            // for try 0. Otherwise, we'll include it as best effort with other options.
-            if (decoderSupportsAndroidRLowLatency(decoderInfo, videoFormat.getString(MediaFormat.KEY_MIME))) {
-                return true;
-            }
+    public static void setDecoderLowLatencyOptions(MediaFormat videoFormat, MediaCodecInfo decoderInfo, String mimeType) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && decoderSupportsAndroidRLowLatency(decoderInfo, mimeType)) {
+            videoFormat.setInteger(MediaFormat.KEY_LOW_LATENCY, 1);
        }
-
-        if (tryNumber < 2 &&
-                (!Build.MANUFACTURER.equalsIgnoreCase("xiaomi") || Build.VERSION.SDK_INT > Build.VERSION_CODES.M)) {
-            // MediaTek decoders don't use vendor-defined keys for low latency mode. Instead, they have a modified
-            // version of AOSP's ACodec.cpp which supports the "vdec-lowlatency" option. This option is passed down
-            // to the decoder as OMX.MTK.index.param.video.LowLatencyDecode.
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // MediaCodec supports vendor-defined format keys using the "vendor.<extension name>.<parameter name>" syntax.
+            // These allow access to functionality that is not exposed through documented MediaFormat.KEY_* values.
+            // https://cs.android.com/android/platform/superproject/+/master:hardware/qcom/sdm845/media/mm-video-v4l2/vidc/common/inc/vidc_vendor_extensions.h;l=67
            //
-            // This option is also plumbed for Amazon Amlogic-based devices like the Fire TV 3. Not only does it
-            // reduce latency on Amlogic, it fixes the HEVC bug that causes the decoder to not output any frames.
-            // Unfortunately, it does the exact opposite for the Xiaomi MITV4-ANSM0, breaking it in the way that
-            // Fire TV was broken prior to vdec-lowlatency :(
-            //
-            // On Fire TV 3, vdec-lowlatency is translated to OMX.amazon.fireos.index.video.lowLatencyDecode.
-            //
-            // https://github.com/yuan1617/Framwork/blob/master/frameworks/av/media/libstagefright/ACodec.cpp
-            // https://github.com/iykex/vendor_mediatek_proprietary_hardware/blob/master/libomx/video/MtkOmxVdecEx/MtkOmxVdecEx.h
-            videoFormat.setInteger("vdec-lowlatency", 1);
-            setNewOption = true;
-        }
-
-        // MediaCodec supports vendor-defined format keys using the "vendor.<extension name>.<parameter name>" syntax.
-        // These allow access to functionality that is not exposed through documented MediaFormat.KEY_* values.
-        // https://cs.android.com/android/platform/superproject/+/master:hardware/qcom/sdm845/media/mm-video-v4l2/vidc/common/inc/vidc_vendor_extensions.h;l=67
-        //
-        // MediaCodec vendor extension support was introduced in Android 8.0:
-        // https://cs.android.com/android/_/android/platform/frameworks/av/+/01c10f8cdcd58d1e7025f426a72e6e75ba5d7fc2
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // Try vendor-specific low latency options
-            //
-            // NOTE: Update knownVendorLowLatencyOptions if you modify this code!
-            if (isDecoderInList(qualcommDecoderPrefixes, decoderInfo.getName())) {
-                // Examples of Qualcomm's vendor extensions for Snapdragon 845:
-                // https://cs.android.com/android/platform/superproject/+/master:hardware/qcom/sdm845/media/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp
-                // https://cs.android.com/android/_/android/platform/hardware/qcom/sm8150/media/+/0621ceb1c1b19564999db8293574a0e12952ff6c
-                //
-                // We will first try both, then try vendor.qti-ext-dec-low-latency.enable alone if that fails
-                if (tryNumber < 3) {
-                    videoFormat.setInteger("vendor.qti-ext-dec-picture-order.enable", 1);
-                    setNewOption = true;
-                }
-                if (tryNumber < 4) {
+            // MediaCodec vendor extension support was introduced in Android 8.0:
+            // https://cs.android.com/android/_/android/platform/frameworks/av/+/01c10f8cdcd58d1e7025f426a72e6e75ba5d7fc2
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                // Try vendor-specific low latency options
+                if (isDecoderInList(qualcommDecoderPrefixes, decoderInfo.getName())) {
+                    // Examples of Qualcomm's vendor extensions for Snapdragon 845:
+                    // https://cs.android.com/android/platform/superproject/+/master:hardware/qcom/sdm845/media/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp
+                    // https://cs.android.com/android/_/android/platform/hardware/qcom/sm8150/media/+/0621ceb1c1b19564999db8293574a0e12952ff6c
                    videoFormat.setInteger("vendor.qti-ext-dec-low-latency.enable", 1);
-                    setNewOption = true;
                }
-            }
-            else if (isDecoderInList(kirinDecoderPrefixes, decoderInfo.getName())) {
-                if (tryNumber < 3) {
+                else if (isDecoderInList(kirinDecoderPrefixes, decoderInfo.getName())) {
                    // Kirin low latency options
                    // https://developer.huawei.com/consumer/cn/forum/topic/0202325564295980115
                    videoFormat.setInteger("vendor.hisi-ext-low-latency-video-dec.video-scene-for-low-latency-req", 1);
                    videoFormat.setInteger("vendor.hisi-ext-low-latency-video-dec.video-scene-for-low-latency-rdy", -1);
-                    setNewOption = true;
                }
-            }
-            else if (isDecoderInList(exynosDecoderPrefixes, decoderInfo.getName())) {
-                if (tryNumber < 3) {
+                else if (isDecoderInList(exynosDecoderPrefixes, decoderInfo.getName())) {
                    // Exynos low latency option for H.264 decoder
                    videoFormat.setInteger("vendor.rtc-ext-dec-low-latency.enable", 1);
-                    setNewOption = true;
                }
            }
-            else if (isDecoderInList(amlogicDecoderPrefixes, decoderInfo.getName())) {
-                if (tryNumber < 3) {
-                    // Amlogic low latency vendor extension
-                    // https://github.com/codewalkerster/android_vendor_amlogic_common_prebuilt_libstagefrighthw/commit/41fefc4e035c476d58491324a5fe7666bfc2989e
-                    videoFormat.setInteger("vendor.low-latency.enable", 1);
-                    setNewOption = true;
-                }
+
+            if (MediaCodecHelper.decoderSupportsMaxOperatingRate(decoderInfo.getName())) {
+                videoFormat.setInteger(MediaFormat.KEY_OPERATING_RATE, Short.MAX_VALUE);
            }
        }
-
-        // FIXME: We should probably integrate this into the try system
-        if (MediaCodecHelper.decoderSupportsMaxOperatingRate(decoderInfo.getName())) {
-            videoFormat.setInteger(MediaFormat.KEY_OPERATING_RATE, Short.MAX_VALUE);
-        }
-
-        return setNewOption;
-    }
-
-    public static boolean decoderSupportsFusedIdrFrame(MediaCodecInfo decoderInfo, String mimeType) {
-        // If adaptive playback is supported, we can submit new CSD together with a keyframe
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            try {
-                if (decoderInfo.getCapabilitiesForType(mimeType).
-                        isFeatureSupported(CodecCapabilities.FEATURE_AdaptivePlayback))
-                {
-                    LimeLog.info("Decoder supports fused IDR frames (FEATURE_AdaptivePlayback)");
-                    return true;
-                }
-            } catch (Exception e) {
-                // Tolerate buggy codecs
-                e.printStackTrace();
-            }
-        }
-
-        return false;
    }

    public static boolean decoderSupportsAdaptivePlayback(MediaCodecInfo decoderInfo, String mimeType) {
@@ -648,14 +486,15 @@ public class MediaCodecHelper {
        return isDecoderInList(baselineProfileHackPrefixes, decoderName);
    }

-    public static byte getDecoderOptimalSlicesPerFrame(String decoderName) {
-        if (isDecoderInList(useFourSlicesPrefixes, decoderName)) {
-            // 4 slices per frame reduces decoding latency on older Qualcomm devices
-            return 4;
+    public static boolean decoderBlacklistedForFrameRate(String decoderName, int fps) {
+        if (fps == 49) {
+            return isDecoderInList(blacklisted49FpsDecoderPrefixes, decoderName);
+        }
+        else if (fps == 59) {
+            return isDecoderInList(blacklisted59FpsDecoderPrefixes, decoderName);
        }
        else {
-            // 1 slice per frame produces the optimal encoding efficiency
-            return 1;
+            return false;
        }
    }

@@ -674,24 +513,25 @@ public class MediaCodecHelper {
        return isDecoderInList(refFrameInvalidationAvcPrefixes, decoderName);
    }

-    public static boolean decoderSupportsRefFrameInvalidationHevc(MediaCodecInfo decoderInfo) {
-        // HEVC decoders seem to universally support RFI, but it can have huge latency penalties
-        // for some decoders due to the number of references frames being > 1. Old Amlogic
-        // decoders are known to have this problem.
-        //
-        // If the decoder supports FEATURE_LowLatency or any vendor low latency option,
-        // we will use that as an indication that it can handle HEVC RFI without excessively
-        // buffering frames.
-        if (decoderSupportsAndroidRLowLatency(decoderInfo, "video/hevc") ||
-                decoderSupportsKnownVendorLowLatencyOption(decoderInfo.getName())) {
-            LimeLog.info("Enabling HEVC RFI based on low latency option support");
-            return true;
-        }
-
-        return isDecoderInList(refFrameInvalidationHevcPrefixes, decoderInfo.getName());
+    public static boolean decoderSupportsRefFrameInvalidationHevc(String decoderName) {
+        return isDecoderInList(refFrameInvalidationHevcPrefixes, decoderName);
    }

-    public static boolean decoderIsWhitelistedForHevc(MediaCodecInfo decoderInfo) {
+    public static boolean decoderIsWhitelistedForHevc(String decoderName, boolean meteredData, PreferenceConfiguration prefs) {
+        // TODO: Shield Tablet K1/LTE?
+        //
+        // NVIDIA does partial HEVC acceleration on the Shield Tablet. I don't know
+        // whether the performance is good enough to use for streaming, but they're
+        // using the same omx.nvidia.h265.decode name as the Shield TV which has a
+        // fully accelerated HEVC pipeline. AFAIK, the only K1 device with this
+        // partially accelerated HEVC decoder is the Shield Tablet, so I'll
+        // check for it here.
+        //
+        // TODO: Temporarily disabled with NVIDIA HEVC support
+        /*if (Build.DEVICE.equalsIgnoreCase("shieldtablet")) {
+            return false;
+        }*/
+
        // Google didn't have official support for HEVC (or more importantly, a CTS test) until
        // Lollipop. I've seen some MediaTek devices on 4.4 crash when attempting to use HEVC,
        // so I'm restricting HEVC usage to Lollipop and higher.
@@ -705,36 +545,26 @@ public class MediaCodecHelper {
        // OMX.qcom.video.decoder.hevcswvdec
        // OMX.SEC.hevc.sw.dec
        //
-        if (decoderInfo.getName().contains("sw")) {
-            LimeLog.info("Disallowing HEVC on software decoder: " + decoderInfo.getName());
-            return false;
-        }
-        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && (!decoderInfo.isHardwareAccelerated() || decoderInfo.isSoftwareOnly())) {
-            LimeLog.info("Disallowing HEVC on software decoder: " + decoderInfo.getName());
+        if (decoderName.contains("sw")) {
            return false;
        }

-        // If this device is media performance class 12 or higher, we will assume any hardware
-        // HEVC decoder present is fast and modern enough for streaming.
-        //
-        // [5.3/H-1-1] MUST NOT drop more than 2 frames in 10 seconds (i.e less than 0.333 percent frame drop) for a 1080p 60 fps video session under load.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            LimeLog.info("Media performance class: " + Build.VERSION.MEDIA_PERFORMANCE_CLASS);
-            if (Build.VERSION.MEDIA_PERFORMANCE_CLASS >= Build.VERSION_CODES.S) {
-                LimeLog.info("Allowing HEVC based on media performance class");
+        // Some devices have HEVC decoders that we prefer not to use
+        // typically because it can't support reference frame invalidation.
+        // However, we will use it for HDR and for streaming over mobile networks
+        // since it works fine otherwise. We will also use it for 4K because RFI
+        // is currently disabled due to issues with video corruption.
+        if (isDecoderInList(deprioritizedHevcDecoders, decoderName)) {
+            if (meteredData || (prefs.width == 3840 && prefs.height == 2160)) {
+                LimeLog.info("Selected deprioritized decoder");
                return true;
            }
+            else {
+                return false;
+            }
        }

-        // If the decoder supports FEATURE_LowLatency, we will assume it is fast and modern enough
-        // to be preferable for streaming over H.264 decoders.
-        if (decoderSupportsAndroidRLowLatency(decoderInfo, "video/hevc")) {
-            LimeLog.info("Allowing HEVC based on FEATURE_LowLatency support");
-            return true;
-        }
-
-        // Otherwise, we use our list of known working HEVC decoders
-        return isDecoderInList(whitelistedHevcDecoders, decoderInfo.getName());
+        return isDecoderInList(whitelistedHevcDecoders, decoderName);
    }
    
    @SuppressWarnings("deprecation")
@@ -807,7 +637,7 @@ public class MediaCodecHelper {
    private static boolean isCodecBlacklisted(MediaCodecInfo codecInfo) {
        // Use the new isSoftwareOnly() function on Android Q
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (!SHOULD_BYPASS_SOFTWARE_BLOCK && codecInfo.isSoftwareOnly()) {
+            if (!IS_EMULATOR && codecInfo.isSoftwareOnly()) {
                LimeLog.info("Skipping software-only decoder: "+codecInfo.getName());
                return true;
            }
@@ -938,7 +768,8 @@ public class MediaCodecHelper {
    
    public static String readCpuinfo() throws Exception {
        StringBuilder cpuInfo = new StringBuilder();
-        try (final BufferedReader br = new BufferedReader(new FileReader(new File("/proc/cpuinfo")))) {
+        BufferedReader br = new BufferedReader(new FileReader(new File("/proc/cpuinfo")));
+        try {
            for (;;) {
                int ch = br.read();
                if (ch == -1)
@@ -947,6 +778,8 @@ public class MediaCodecHelper {
            }

            return cpuInfo.toString();
+        } finally {
+            br.close();
        }
    }
    
@@ -9,9 +9,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;

-import com.limelight.LimeLog;
 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;

 import android.content.ContentValues;
 import android.content.Context;
@@ -19,28 +17,17 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;

-import org.json.JSONException;
-import org.json.JSONObject;
-
 public class ComputerDatabaseManager {
-    private static final String COMPUTER_DB_NAME = "computers4.db";
+    private static final String COMPUTER_DB_NAME = "computers3.db";
    private static final String COMPUTER_TABLE_NAME = "Computers";
    private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
    private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
    private static final String ADDRESSES_COLUMN_NAME = "Addresses";
-    private interface AddressFields {
-        String LOCAL = "local";
-        String REMOTE = "remote";
-        String MANUAL = "manual";
-        String IPv6 = "ipv6";
-
-        String ADDRESS = "address";
-        String PORT = "port";
-    }
-
    private static final String MAC_ADDRESS_COLUMN_NAME = "MacAddress";
    private static final String SERVER_CERT_COLUMN_NAME = "ServerCert";

+    private static final char ADDRESS_DELIMITER = ';';
+
    private SQLiteDatabase computerDb;

    public ComputerDatabaseManager(Context c) {
@@ -75,54 +62,24 @@ public class ComputerDatabaseManager {
        for (ComputerDetails computer : oldComputers) {
            updateComputer(computer);
        }
-        oldComputers = LegacyDatabaseReader3.migrateAllComputers(c);
-        for (ComputerDetails computer : oldComputers) {
-            updateComputer(computer);
-        }
    }

    public void deleteComputer(ComputerDetails details) {
        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{details.uuid});
    }

-    public static JSONObject tupleToJson(ComputerDetails.AddressTuple tuple) throws JSONException {
-        if (tuple == null) {
-            return null;
-        }
-
-        JSONObject json = new JSONObject();
-        json.put(AddressFields.ADDRESS, tuple.address);
-        json.put(AddressFields.PORT, tuple.port);
-
-        return json;
-    }
-
-    public static ComputerDetails.AddressTuple tupleFromJson(JSONObject json, String name) throws JSONException {
-        if (!json.has(name)) {
-            return null;
-        }
-
-        JSONObject address = json.getJSONObject(name);
-        return new ComputerDetails.AddressTuple(
-                address.getString(AddressFields.ADDRESS), address.getInt(AddressFields.PORT));
-    }
-
    public boolean updateComputer(ComputerDetails details) {
        ContentValues values = new ContentValues();
        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid);
        values.put(COMPUTER_NAME_COLUMN_NAME, details.name);

-        try {
-            JSONObject addresses = new JSONObject();
-            addresses.put(AddressFields.LOCAL, tupleToJson(details.localAddress));
-            addresses.put(AddressFields.REMOTE, tupleToJson(details.remoteAddress));
-            addresses.put(AddressFields.MANUAL, tupleToJson(details.manualAddress));
-            addresses.put(AddressFields.IPv6, tupleToJson(details.ipv6Address));
-            values.put(ADDRESSES_COLUMN_NAME, addresses.toString());
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
+        StringBuilder addresses = new StringBuilder();
+        addresses.append(details.localAddress != null ? details.localAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.remoteAddress != null ? details.remoteAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.manualAddress != null ? details.manualAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.ipv6Address != null ? details.ipv6Address : "");

+        values.put(ADDRESSES_COLUMN_NAME, addresses.toString());
        values.put(MAC_ADDRESS_COLUMN_NAME, details.macAddress);
        try {
            if (details.serverCert != null) {
@@ -138,28 +95,26 @@ public class ComputerDatabaseManager {
        return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
    }

+    private static String readNonEmptyString(String input) {
+        if (input.isEmpty()) {
+            return null;
+        }
+
+        return input;
+    }
+
    private ComputerDetails getComputerFromCursor(Cursor c) {
        ComputerDetails details = new ComputerDetails();

        details.uuid = c.getString(0);
        details.name = c.getString(1);
-        try {
-            JSONObject addresses = new JSONObject(c.getString(2));
-            details.localAddress = tupleFromJson(addresses, AddressFields.LOCAL);
-            details.remoteAddress = tupleFromJson(addresses, AddressFields.REMOTE);
-            details.manualAddress = tupleFromJson(addresses, AddressFields.MANUAL);
-            details.ipv6Address = tupleFromJson(addresses, AddressFields.IPv6);
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-         }

-        // External port is persisted in the remote address field
-        if (details.remoteAddress != null) {
-            details.externalPort = details.remoteAddress.port;
-        }
-        else {
-            details.externalPort = NvHTTP.DEFAULT_HTTP_PORT;
-        }
+        String[] addresses = c.getString(2).split(""+ADDRESS_DELIMITER, -1);
+
+        details.localAddress = readNonEmptyString(addresses[0]);
+        details.remoteAddress = readNonEmptyString(addresses[1]);
+        details.manualAddress = readNonEmptyString(addresses[2]);
+        details.ipv6Address = readNonEmptyString(addresses[3]);

        details.macAddress = c.getString(3);

@@ -181,26 +136,28 @@ public class ComputerDatabaseManager {
    }

    public List<ComputerDetails> getAllComputers() {
-        try (final Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null)) {
-            LinkedList<ComputerDetails> computerList = new LinkedList<>();
-            while (c.moveToNext()) {
-                computerList.add(getComputerFromCursor(c));
-            }
-            return computerList;
+        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
+        LinkedList<ComputerDetails> computerList = new LinkedList<>();
+        while (c.moveToNext()) {
+            computerList.add(getComputerFromCursor(c));
        }
+
+        c.close();
+
+        return computerList;
    }

    public ComputerDetails getComputerByUUID(String uuid) {
-        try (final Cursor c = computerDb.query(
-                COMPUTER_TABLE_NAME, null, COMPUTER_UUID_COLUMN_NAME+"=?",
-                new String[]{ uuid }, null, null, null)
-        ) {
-            if (!c.moveToFirst()) {
-                // No matching computer
-                return null;
-            }
-
-            return getComputerFromCursor(c);
+        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{ uuid }, null, null, null);
+        if (!c.moveToFirst()) {
+            // No matching computer
+            c.close();
+            return null;
        }
+
+        ComputerDetails details = getComputerFromCursor(c);
+        c.close();
+
+        return details;
    }
 }
@@ -5,6 +5,8 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.net.Inet4Address;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -47,7 +49,8 @@ public class ComputerManagerService extends Service {
    private static final int APPLIST_POLLING_PERIOD_MS = 30000;
    private static final int APPLIST_FAILED_POLLING_RETRY_MS = 2000;
    private static final int MDNS_QUERY_PERIOD_MS = 1000;
-    private static final int OFFLINE_POLL_TRIES = 3;
+    private static final int FAST_POLL_TIMEOUT = 1000;
+    private static final int OFFLINE_POLL_TRIES = 5;
    private static final int INITIAL_POLL_TRIES = 2;
    private static final int EMPTY_LIST_THRESHOLD = 3;
    private static final int POLL_DATA_TTL_MS = 30000;
@@ -64,8 +67,6 @@ public class ComputerManagerService extends Service {
    private boolean pollingActive = false;
    private final Lock defaultNetworkLock = new ReentrantLock();

-    private ConnectivityManager.NetworkCallback networkCallback;
-
    private DiscoveryService.DiscoveryBinder discoveryBinder;
    private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
        public void onServiceConnected(ComponentName className, IBinder binder) {
@@ -141,7 +142,7 @@ public class ComputerManagerService extends Service {
                    // then use STUN to populate the external address field if
                    // it's not set already.
                    if (details.remoteAddress == null) {
-                        InetAddress addr = InetAddress.getByName(details.activeAddress.address);
+                        InetAddress addr = InetAddress.getByName(details.activeAddress);
                        if (addr.isSiteLocalAddress()) {
                            populateExternalAddress(details);
                        }
@@ -231,13 +232,7 @@ public class ComputerManagerService extends Service {
                        // Wait for the bind notification
                        discoveryServiceConnection.wait(1000);
                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-
-                    // InterruptedException clears the thread's interrupt status. Since we can't
-                    // handle that here, we will re-interrupt the thread to set the interrupt
-                    // status back to true.
-                    Thread.currentThread().interrupt();
+                } catch (InterruptedException ignored) {
                }
            }
        }
@@ -246,18 +241,11 @@ public class ComputerManagerService extends Service {
            while (activePolls.get() != 0) {
                try {
                    Thread.sleep(250);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-
-                    // InterruptedException clears the thread's interrupt status. Since we can't
-                    // handle that here, we will re-interrupt the thread to set the interrupt
-                    // status back to true.
-                    Thread.currentThread().interrupt();
-                }
+                } catch (InterruptedException ignored) {}
            }
        }

-        public boolean addComputerBlocking(ComputerDetails fakeDetails) throws InterruptedException {
+        public boolean addComputerBlocking(ComputerDetails fakeDetails) {
            return ComputerManagerService.this.addComputerBlocking(fakeDetails);
        }

@@ -371,12 +359,7 @@ public class ComputerManagerService extends Service {

        // Perform the STUN request if we're not on a VPN or if we bound to a network
        if (!activeNetworkIsVpn || boundToNetwork) {
-            String stunResolvedAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
-            if (stunResolvedAddress != null) {
-                // We don't know for sure what the external port is, so we will have to guess.
-                // When we contact the PC (if we haven't already), it will update the port.
-                details.remoteAddress = new ComputerDetails.AddressTuple(stunResolvedAddress, details.guessExternalPort());
-            }
+            details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
        }

        // Unbind from the network
@@ -403,7 +386,7 @@ public class ComputerManagerService extends Service {

                // Populate the computer template with mDNS info
                if (computer.getLocalAddress() != null) {
-                    details.localAddress = new ComputerDetails.AddressTuple(computer.getLocalAddress().getHostAddress(), computer.getPort());
+                    details.localAddress = computer.getLocalAddress().getHostAddress();

                    // Since we're on the same network, we can use STUN to find
                    // our WAN address, which is also very likely the WAN address
@@ -413,24 +396,20 @@ public class ComputerManagerService extends Service {
                    }
                }
                if (computer.getIpv6Address() != null) {
-                    details.ipv6Address = new ComputerDetails.AddressTuple(computer.getIpv6Address().getHostAddress(), computer.getPort());
+                    details.ipv6Address = computer.getIpv6Address().getHostAddress();
                }

-                try {
-                    // Kick off a blocking serverinfo poll on this machine
-                    if (!addComputerBlocking(details)) {
-                        LimeLog.warning("Auto-discovered PC failed to respond: "+details);
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-
-                    // InterruptedException clears the thread's interrupt status. Since we can't
-                    // handle that here, we will re-interrupt the thread to set the interrupt
-                    // status back to true.
-                    Thread.currentThread().interrupt();
+                // Kick off a serverinfo poll on this machine
+                if (!addComputerBlocking(details)) {
+                    LimeLog.warning("Auto-discovered PC failed to respond: "+details);
                }
            }

+            @Override
+            public void notifyComputerRemoved(MdnsComputer computer) {
+                // Nothing to do here
+            }
+
            @Override
            public void notifyDiscoveryFailure(Exception e) {
                LimeLog.severe("mDNS discovery failed");
@@ -470,25 +449,28 @@ public class ComputerManagerService extends Service {
        }
    }

-    public boolean addComputerBlocking(ComputerDetails fakeDetails) throws InterruptedException {
+    public boolean addComputerBlocking(ComputerDetails fakeDetails) {
        // Block while we try to fill the details
-
-        // 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;
+        try {
+            // We cannot use runPoll() here because it will attempt to persist the state of the machine
+            // in the database, which would be bad because we don't have our pinned cert loaded yet.
+            if (pollComputer(fakeDetails)) {
+                // See if we have record of this PC to pull its pinned cert
+                synchronized (pollingTuples) {
+                    for (PollingTuple tuple : pollingTuples) {
+                        if (tuple.computer.uuid.equals(fakeDetails.uuid)) {
+                            fakeDetails.serverCert = tuple.computer.serverCert;
+                            break;
+                        }
                    }
                }
-            }

-            // Poll again, possibly with the pinned cert, to get accurate pairing information.
-            // This will insert the host into the database too.
-            runPoll(fakeDetails, true, 0);
+                // 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;
        }

        // If the machine is reachable, it was successful
@@ -545,21 +527,17 @@ public class ComputerManagerService extends Service {
        }
    }

-    private ComputerDetails tryPollIp(ComputerDetails details, ComputerDetails.AddressTuple address) {
-        try {
-            // If the current address's port number matches the active address's port number, we can also assume
-            // the HTTPS port will also match. This assumption is currently safe because Sunshine sets all ports
-            // as offsets from the base HTTP port and doesn't allow custom HttpsPort responses for WAN vs LAN.
-            boolean portMatchesActiveAddress = details.state == ComputerDetails.State.ONLINE &&
-                    details.activeAddress != null && address.port == details.activeAddress.port;
+    private ComputerDetails tryPollIp(ComputerDetails details, String address) {
+        // Fast poll this address first to determine if we can connect at the TCP layer
+        if (!fastPollIp(address)) {
+            return null;
+        }

-            NvHTTP http = new NvHTTP(address, portMatchesActiveAddress ? details.httpsPort : 0, idManager.getUniqueId(), details.serverCert,
+        try {
+            NvHTTP http = new NvHTTP(address, idManager.getUniqueId(), details.serverCert,
                    PlatformBinding.getCryptoProvider(ComputerManagerService.this));

-            // If this PC is currently online at this address, extend the timeouts to allow more time for the PC to respond.
-            boolean isLikelyOnline = details.state == ComputerDetails.State.ONLINE && address.equals(details.activeAddress);
-
-            ComputerDetails newDetails = http.getComputerDetails(isLikelyOnline);
+            ComputerDetails newDetails = http.getComputerDetails();

            // Check if this is the PC we expected
            if (newDetails.uuid == null) {
@@ -573,140 +551,146 @@ public class ComputerManagerService extends Service {
                return null;
            }

+            // Set the new active address
+            newDetails.activeAddress = address;
+
            return newDetails;
-        } catch (XmlPullParserException e) {
+        } catch (XmlPullParserException | IOException e) {
            e.printStackTrace();
            return null;
+        }
+    }
+
+    // Just try to establish a TCP connection to speculatively detect a running
+    // GFE server
+    private boolean fastPollIp(String address) {
+        if (address == null) {
+            // Don't bother if our address is null
+            return false;
+        }
+
+        Socket s = new Socket();
+        try {
+            s.connect(new InetSocketAddress(address, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
+            s.close();
+            return true;
        } catch (IOException e) {
-            return null;
+            return false;
        }
    }

-    private static class ParallelPollTuple {
-        public ComputerDetails.AddressTuple address;
-        public ComputerDetails existingDetails;
-
-        public boolean complete;
-        public Thread pollingThread;
-        public ComputerDetails returnedDetails;
-
-        public ParallelPollTuple(ComputerDetails.AddressTuple address, ComputerDetails existingDetails) {
-            this.address = address;
-            this.existingDetails = existingDetails;
-        }
-
-        public void interrupt() {
-            if (pollingThread != null) {
-                pollingThread.interrupt();
-            }
-        }
-    }
-
-    private void startParallelPollThread(ParallelPollTuple tuple, HashSet<ComputerDetails.AddressTuple> uniqueAddresses) {
-        // Don't bother starting a polling thread for an address that doesn't exist
-        // or if the address has already been polled with an earlier tuple
-        if (tuple.address == null || !uniqueAddresses.add(tuple.address)) {
-            tuple.complete = true;
-            tuple.returnedDetails = null;
-            return;
-        }
-
-        tuple.pollingThread = new Thread() {
+    private void startFastPollThread(final String address, final boolean[] info) {
+        Thread t = new Thread() {
            @Override
            public void run() {
-                ComputerDetails details = tryPollIp(tuple.existingDetails, tuple.address);
+                boolean pollRes = fastPollIp(address);

-                synchronized (tuple) {
-                    tuple.complete = true; // Done
-                    tuple.returnedDetails = details; // Polling result
+                synchronized (info) {
+                    info[0] = true; // Done
+                    info[1] = pollRes; // Polling result

-                    tuple.notify();
+                    info.notify();
                }
            }
        };
-        tuple.pollingThread.setName("Parallel Poll - "+tuple.address+" - "+tuple.existingDetails.name);
-        tuple.pollingThread.start();
+        t.setName("Fast Poll - "+address);
+        t.start();
    }

-    private ComputerDetails parallelPollPc(ComputerDetails details) throws InterruptedException {
-        ParallelPollTuple localInfo = new ParallelPollTuple(details.localAddress, details);
-        ParallelPollTuple manualInfo = new ParallelPollTuple(details.manualAddress, details);
-        ParallelPollTuple remoteInfo = new ParallelPollTuple(details.remoteAddress, details);
-        ParallelPollTuple ipv6Info = new ParallelPollTuple(details.ipv6Address, details);
+    private String fastPollPc(final String localAddress, final String remoteAddress, final String manualAddress, final String ipv6Address) throws InterruptedException {
+        final boolean[] remoteInfo = new boolean[2];
+        final boolean[] localInfo = new boolean[2];
+        final boolean[] manualInfo = new boolean[2];
+        final boolean[] ipv6Info = new boolean[2];

-        // These must be started in order of precedence for the deduplication algorithm
-        // to result in the correct behavior.
-        HashSet<ComputerDetails.AddressTuple> uniqueAddresses = new HashSet<>();
-        startParallelPollThread(localInfo, uniqueAddresses);
-        startParallelPollThread(manualInfo, uniqueAddresses);
-        startParallelPollThread(remoteInfo, uniqueAddresses);
-        startParallelPollThread(ipv6Info, uniqueAddresses);
+        startFastPollThread(localAddress, localInfo);
+        startFastPollThread(remoteAddress, remoteInfo);
+        startFastPollThread(manualAddress, manualInfo);
+        startFastPollThread(ipv6Address, ipv6Info);

-        try {
-            // Check local first
-            synchronized (localInfo) {
-                while (!localInfo.complete) {
-                    localInfo.wait();
-                }
-
-                if (localInfo.returnedDetails != null) {
-                    localInfo.returnedDetails.activeAddress = localInfo.address;
-                    return localInfo.returnedDetails;
-                }
+        // Check local first
+        synchronized (localInfo) {
+            while (!localInfo[0]) {
+                localInfo.wait(500);
            }

-            // Now manual
-            synchronized (manualInfo) {
-                while (!manualInfo.complete) {
-                    manualInfo.wait();
-                }
+            if (localInfo[1]) {
+                return localAddress;
+            }
+        }

-                if (manualInfo.returnedDetails != null) {
-                    manualInfo.returnedDetails.activeAddress = manualInfo.address;
-                    return manualInfo.returnedDetails;
-                }
+        // Now manual
+        synchronized (manualInfo) {
+            while (!manualInfo[0]) {
+                manualInfo.wait(500);
            }

-            // Now remote IPv4
-            synchronized (remoteInfo) {
-                while (!remoteInfo.complete) {
-                    remoteInfo.wait();
-                }
+            if (manualInfo[1]) {
+                return manualAddress;
+            }
+        }

-                if (remoteInfo.returnedDetails != null) {
-                    remoteInfo.returnedDetails.activeAddress = remoteInfo.address;
-                    return remoteInfo.returnedDetails;
-                }
+        // Now remote IPv4
+        synchronized (remoteInfo) {
+            while (!remoteInfo[0]) {
+                remoteInfo.wait(500);
            }

-            // Now global IPv6
-            synchronized (ipv6Info) {
-                while (!ipv6Info.complete) {
-                    ipv6Info.wait();
-                }
+            if (remoteInfo[1]) {
+                return remoteAddress;
+            }
+        }

-                if (ipv6Info.returnedDetails != null) {
-                    ipv6Info.returnedDetails.activeAddress = ipv6Info.address;
-                    return ipv6Info.returnedDetails;
-                }
+        // Now global IPv6
+        synchronized (ipv6Info) {
+            while (!ipv6Info[0]) {
+                ipv6Info.wait(500);
+            }
+
+            if (ipv6Info[1]) {
+                return ipv6Address;
            }
-        } finally {
-            // Stop any further polling if we've found a working address or we've been
-            // interrupted by an attempt to stop polling.
-            localInfo.interrupt();
-            manualInfo.interrupt();
-            remoteInfo.interrupt();
-            ipv6Info.interrupt();
        }

        return null;
    }

    private boolean pollComputer(ComputerDetails details) throws InterruptedException {
-        // Poll all addresses in parallel to speed up the process
-        LimeLog.info("Starting parallel poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +", "+details.manualAddress+", "+details.ipv6Address+")");
-        ComputerDetails polledDetails = parallelPollPc(details);
-        LimeLog.info("Parallel poll for "+details.name+" returned address: "+details.activeAddress);
+        ComputerDetails polledDetails;
+
+        // Do a TCP-level connection to the HTTP server to see if it's listening.
+        // Do not write this address to details.activeAddress because:
+        // a) it's only a candidate and may be wrong (multiple PCs behind a single router)
+        // b) if it's null, it will be unexpectedly nulling the activeAddress of a possibly online PC
+        LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +", "+details.manualAddress+", "+details.ipv6Address+")");
+        String candidateAddress = fastPollPc(details.localAddress, details.remoteAddress, details.manualAddress, details.ipv6Address);
+        LimeLog.info("Fast poll for "+details.name+" returned candidate address: "+candidateAddress);
+
+        // If no connection could be established to either IP address, there's nothing we can do
+        if (candidateAddress == null) {
+            return false;
+        }
+
+        // Try using the active address from fast-poll
+        polledDetails = tryPollIp(details, candidateAddress);
+        if (polledDetails == null) {
+            // If that failed, try all unique addresses except what we've
+            // already tried
+            HashSet<String> uniqueAddresses = new HashSet<>();
+            uniqueAddresses.add(details.localAddress);
+            uniqueAddresses.add(details.manualAddress);
+            uniqueAddresses.add(details.remoteAddress);
+            uniqueAddresses.add(details.ipv6Address);
+            for (String addr : uniqueAddresses) {
+                if (addr == null || addr.equals(candidateAddress)) {
+                    continue;
+                }
+                polledDetails = tryPollIp(details, addr);
+                if (polledDetails != null) {
+                    break;
+                }
+            }
+        }

        if (polledDetails != null) {
            details.update(polledDetails);
@@ -741,49 +725,10 @@ public class ComputerManagerService extends Service {
        }

        releaseLocalDatabaseReference();
-
-        // Monitor for network changes to invalidate our PC state
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            networkCallback = new ConnectivityManager.NetworkCallback() {
-                @Override
-                public void onAvailable(Network network) {
-                    LimeLog.info("Resetting PC state for new available network");
-                    synchronized (pollingTuples) {
-                        for (PollingTuple tuple : pollingTuples) {
-                            tuple.computer.state = ComputerDetails.State.UNKNOWN;
-                            if (listener != null) {
-                                listener.notifyComputerUpdated(tuple.computer);
-                            }
-                        }
-                    }
-                }
-
-                @Override
-                public void onLost(Network network) {
-                    LimeLog.info("Offlining PCs due to network loss");
-                    synchronized (pollingTuples) {
-                        for (PollingTuple tuple : pollingTuples) {
-                            tuple.computer.state = ComputerDetails.State.OFFLINE;
-                            if (listener != null) {
-                                listener.notifyComputerUpdated(tuple.computer);
-                            }
-                        }
-                    }
-                }
-            };
-
-            ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-            connMgr.registerDefaultNetworkCallback(networkCallback);
-        }
    }

    @Override
    public void onDestroy() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-            connMgr.unregisterNetworkCallback(networkCallback);
-        }
-
        if (discoveryBinder != null) {
            // Unbind from the discovery service
            unbindService(discoveryServiceConnection);
@@ -871,7 +816,7 @@ public class ComputerManagerService extends Service {
                        PollingTuple tuple = getPollingTuple(computer);

                        try {
-                            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), computer.httpsPort, idManager.getUniqueId(),
+                            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), idManager.getUniqueId(),
                                    computer.serverCert, PlatformBinding.getCryptoProvider(ComputerManagerService.this));

                            String appList;
@@ -899,12 +844,18 @@ public class ComputerManagerService extends Service {
                            if (!appList.isEmpty() &&
                                    (!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
                                // Open the cache file
-                                try (final OutputStream cacheOut = CacheHelper.openCacheFileForOutput(
-                                        getCacheDir(), "applist", computer.uuid)
-                                ) {
+                                OutputStream cacheOut = null;
+                                try {
+                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid);
                                    CacheHelper.writeStringToOutputStream(cacheOut, appList);
                                } catch (IOException e) {
                                    e.printStackTrace();
+                                } finally {
+                                    try {
+                                        if (cacheOut != null) {
+                                            cacheOut.close();
+                                        }
+                                    } catch (IOException ignored) {}
                                }

                                // Reset empty count if it wasn't empty this time
@@ -33,11 +33,12 @@ public class IdentityManager {
    private static String loadUniqueId(Context c) {
        // 2 Hex digits per byte
        char[] uid = new char[UID_SIZE_IN_BYTES * 2];
+        InputStreamReader reader = null;
        LimeLog.info("Reading UID from disk");
-        try (final InputStreamReader reader =
-                     new InputStreamReader(c.openFileInput(UNIQUE_ID_FILE_NAME))
-        ) {
-            if (reader.read(uid) != UID_SIZE_IN_BYTES * 2) {
+        try {
+            reader = new InputStreamReader(c.openFileInput(UNIQUE_ID_FILE_NAME));
+            if (reader.read(uid) != UID_SIZE_IN_BYTES * 2)
+            {
                LimeLog.severe("UID file data is truncated");
                return null;
            }
@@ -49,6 +50,12 @@ public class IdentityManager {
            LimeLog.severe("Error while reading UID file");
            e.printStackTrace();
            return null;
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException ignored) {}
+            }
        }
    }

@@ -57,14 +64,20 @@ public class IdentityManager {
        LimeLog.info("Generating new UID");
        String uidStr = String.format((Locale)null, "%016x", new Random().nextLong());

-        try (final OutputStreamWriter writer =
-                     new OutputStreamWriter(c.openFileOutput(UNIQUE_ID_FILE_NAME, 0))
-        ) {
+        OutputStreamWriter writer = null;
+        try {
+            writer = new OutputStreamWriter(c.openFileOutput(UNIQUE_ID_FILE_NAME, 0));
            writer.write(uidStr);
            LimeLog.info("UID written to disk");
        } catch (IOException e) {
            LimeLog.severe("Error while writing UID file");
            e.printStackTrace();
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException ignored) {}
+            }
        }

        // We can return a UID even if I/O fails
@@ -7,7 +7,6 @@ import android.database.sqlite.SQLiteException;

 import com.limelight.LimeLog;
 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;

 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -31,26 +30,26 @@ public class LegacyDatabaseReader {
        // too. To disambiguate, we'll need to prefix them with a string
        // greater than the allowable IP address length.
        try {
-            details.localAddress = new ComputerDetails.AddressTuple(InetAddress.getByAddress(c.getBlob(2)).getHostAddress(), NvHTTP.DEFAULT_HTTP_PORT);
+            details.localAddress = InetAddress.getByAddress(c.getBlob(2)).getHostAddress();
            LimeLog.warning("DB: Legacy local address for " + details.name);
        } catch (UnknownHostException e) {
            // This is probably a hostname/address with the prefix string
            String stringData = c.getString(2);
            if (stringData.startsWith(ADDRESS_PREFIX)) {
-                details.localAddress = new ComputerDetails.AddressTuple(c.getString(2).substring(ADDRESS_PREFIX.length()), NvHTTP.DEFAULT_HTTP_PORT);
+                details.localAddress = c.getString(2).substring(ADDRESS_PREFIX.length());
            } else {
                LimeLog.severe("DB: Corrupted local address for " + details.name);
            }
        }

        try {
-            details.remoteAddress = new ComputerDetails.AddressTuple(InetAddress.getByAddress(c.getBlob(3)).getHostAddress(), NvHTTP.DEFAULT_HTTP_PORT);
+            details.remoteAddress = InetAddress.getByAddress(c.getBlob(3)).getHostAddress();
            LimeLog.warning("DB: Legacy remote address for " + details.name);
        } catch (UnknownHostException e) {
            // This is probably a hostname/address with the prefix string
            String stringData = c.getString(3);
            if (stringData.startsWith(ADDRESS_PREFIX)) {
-                details.remoteAddress = new ComputerDetails.AddressTuple(c.getString(3).substring(ADDRESS_PREFIX.length()), NvHTTP.DEFAULT_HTTP_PORT);
+                details.remoteAddress = c.getString(3).substring(ADDRESS_PREFIX.length());
            } else {
                LimeLog.severe("DB: Corrupted remote address for " + details.name);
            }
@@ -69,34 +68,37 @@ public class LegacyDatabaseReader {
    }

    private static List<ComputerDetails> getAllComputers(SQLiteDatabase db) {
-        try (final Cursor c = db.rawQuery("SELECT * FROM " + COMPUTER_TABLE_NAME, null)) {
-            LinkedList<ComputerDetails> computerList = new LinkedList<>();
-            while (c.moveToNext()) {
-                ComputerDetails details = getComputerFromCursor(c);
+        Cursor c = db.rawQuery("SELECT * FROM " + COMPUTER_TABLE_NAME, null);
+        LinkedList<ComputerDetails> computerList = new LinkedList<>();
+        while (c.moveToNext()) {
+            ComputerDetails details = getComputerFromCursor(c);

-                // If a critical field is corrupt or missing, skip the database entry
-                if (details.uuid == null) {
-                    continue;
-                }
-
-                computerList.add(details);
+            // If a critical field is corrupt or missing, skip the database entry
+            if (details.uuid == null) {
+                continue;
            }

-            return computerList;
+            computerList.add(details);
        }
+
+        c.close();
+
+        return computerList;
    }

    public static List<ComputerDetails> migrateAllComputers(Context c) {
-        try (final SQLiteDatabase computerDb = SQLiteDatabase.openDatabase(
-                c.getDatabasePath(COMPUTER_DB_NAME).getPath(),
-                null, SQLiteDatabase.OPEN_READONLY)
-        ) {
+        SQLiteDatabase computerDb = null;
+        try {
            // Open the existing database
+            computerDb = SQLiteDatabase.openDatabase(c.getDatabasePath(COMPUTER_DB_NAME).getPath(), null, SQLiteDatabase.OPEN_READONLY);
            return getAllComputers(computerDb);
        } catch (SQLiteException e) {
            return new LinkedList<ComputerDetails>();
        } finally {
            // Close and delete the old DB
+            if (computerDb != null) {
+                computerDb.close();
+            }
            c.deleteDatabase(COMPUTER_DB_NAME);
        }
    }
@@ -6,7 +6,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;

 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;

 import java.io.ByteArrayInputStream;
 import java.security.cert.CertificateException;
@@ -24,9 +23,9 @@ public class LegacyDatabaseReader2 {

        details.uuid = c.getString(0);
        details.name = c.getString(1);
-        details.localAddress = new ComputerDetails.AddressTuple(c.getString(2), NvHTTP.DEFAULT_HTTP_PORT);
-        details.remoteAddress = new ComputerDetails.AddressTuple(c.getString(3), NvHTTP.DEFAULT_HTTP_PORT);
-        details.manualAddress = new ComputerDetails.AddressTuple(c.getString(4), NvHTTP.DEFAULT_HTTP_PORT);
+        details.localAddress = c.getString(2);
+        details.remoteAddress = c.getString(3);
+        details.manualAddress = c.getString(4);
        details.macAddress = c.getString(5);

        // This column wasn't always present in the old schema
@@ -50,34 +49,37 @@ public class LegacyDatabaseReader2 {
    }

    public static List<ComputerDetails> getAllComputers(SQLiteDatabase computerDb) {
-        try (final Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null)) {
-            LinkedList<ComputerDetails> computerList = new LinkedList<>();
-            while (c.moveToNext()) {
-                ComputerDetails details = getComputerFromCursor(c);
+        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
+        LinkedList<ComputerDetails> computerList = new LinkedList<>();
+        while (c.moveToNext()) {
+            ComputerDetails details = getComputerFromCursor(c);

-                // If a critical field is corrupt or missing, skip the database entry
-                if (details.uuid == null) {
-                    continue;
-                }
-
-                computerList.add(details);
+            // If a critical field is corrupt or missing, skip the database entry
+            if (details.uuid == null) {
+                continue;
            }

-            return computerList;
+            computerList.add(details);
        }
+
+        c.close();
+
+        return computerList;
    }

    public static List<ComputerDetails> migrateAllComputers(Context c) {
-        try (final SQLiteDatabase computerDb = SQLiteDatabase.openDatabase(
-                c.getDatabasePath(COMPUTER_DB_NAME).getPath(),
-                null, SQLiteDatabase.OPEN_READONLY)
-        ) {
+        SQLiteDatabase computerDb = null;
+        try {
            // Open the existing database
+            computerDb = SQLiteDatabase.openDatabase(c.getDatabasePath(COMPUTER_DB_NAME).getPath(), null, SQLiteDatabase.OPEN_READONLY);
            return getAllComputers(computerDb);
        } catch (SQLiteException e) {
            return new LinkedList<ComputerDetails>();
        } finally {
            // Close and delete the old DB
+            if (computerDb != null) {
+                computerDb.close();
+            }
            c.deleteDatabase(COMPUTER_DB_NAME);
        }
    }
@@ -1,123 +0,0 @@
-package com.limelight.computers;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;
-
-import java.io.ByteArrayInputStream;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.LinkedList;
-import java.util.List;
-
-public class LegacyDatabaseReader3 {
-    private static final String COMPUTER_DB_NAME = "computers3.db";
-    private static final String COMPUTER_TABLE_NAME = "Computers";
-
-    private static final char ADDRESS_DELIMITER = ';';
-    private static final char PORT_DELIMITER = '_';
-
-    private static String readNonEmptyString(String input) {
-        if (input.isEmpty()) {
-            return null;
-        }
-
-        return input;
-    }
-
-    private static ComputerDetails.AddressTuple splitAddressToTuple(String input) {
-        if (input == null) {
-            return null;
-        }
-
-        String[] parts = input.split(""+PORT_DELIMITER, -1);
-        if (parts.length == 1) {
-            return new ComputerDetails.AddressTuple(parts[0], NvHTTP.DEFAULT_HTTP_PORT);
-        }
-        else {
-            return new ComputerDetails.AddressTuple(parts[0], Integer.parseInt(parts[1]));
-        }
-    }
-
-    private static String splitTupleToAddress(ComputerDetails.AddressTuple tuple) {
-        return tuple.address+PORT_DELIMITER+tuple.port;
-    }
-
-    private static ComputerDetails getComputerFromCursor(Cursor c) {
-        ComputerDetails details = new ComputerDetails();
-
-        details.uuid = c.getString(0);
-        details.name = c.getString(1);
-
-        String[] addresses = c.getString(2).split(""+ADDRESS_DELIMITER, -1);
-
-        details.localAddress = splitAddressToTuple(readNonEmptyString(addresses[0]));
-        details.remoteAddress = splitAddressToTuple(readNonEmptyString(addresses[1]));
-        details.manualAddress = splitAddressToTuple(readNonEmptyString(addresses[2]));
-        details.ipv6Address = splitAddressToTuple(readNonEmptyString(addresses[3]));
-
-        // External port is persisted in the remote address field
-        if (details.remoteAddress != null) {
-            details.externalPort = details.remoteAddress.port;
-        }
-        else {
-            details.externalPort = NvHTTP.DEFAULT_HTTP_PORT;
-        }
-
-        details.macAddress = c.getString(3);
-
-        try {
-            byte[] derCertData = c.getBlob(4);
-
-            if (derCertData != null) {
-                details.serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
-                        .generateCertificate(new ByteArrayInputStream(derCertData));
-            }
-        } catch (CertificateException e) {
-            e.printStackTrace();
-        }
-
-        // This signifies we don't have dynamic state (like pair state)
-        details.state = ComputerDetails.State.UNKNOWN;
-
-        return details;
-    }
-
-    public static List<ComputerDetails> getAllComputers(SQLiteDatabase computerDb) {
-        try (final Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null)) {
-            LinkedList<ComputerDetails> computerList = new LinkedList<>();
-            while (c.moveToNext()) {
-                ComputerDetails details = getComputerFromCursor(c);
-
-                // If a critical field is corrupt or missing, skip the database entry
-                if (details.uuid == null) {
-                    continue;
-                }
-
-                computerList.add(details);
-            }
-
-            return computerList;
-        }
-    }
-
-    public static List<ComputerDetails> migrateAllComputers(Context c) {
-        try (final SQLiteDatabase computerDb = SQLiteDatabase.openDatabase(
-                c.getDatabasePath(COMPUTER_DB_NAME).getPath(),
-                null, SQLiteDatabase.OPEN_READONLY)
-        ) {
-            // Open the existing database
-            return getAllComputers(computerDb);
-        } catch (SQLiteException e) {
-            return new LinkedList<ComputerDetails>();
-        } finally {
-            // Close and delete the old DB
-            c.deleteDatabase(COMPUTER_DB_NAME);
-        }
-    }
-}
@@ -54,6 +54,13 @@ public class DiscoveryService extends Service {
                }
            }

+            @Override
+            public void notifyComputerRemoved(MdnsComputer computer) {
+                if (boundListener != null) {
+                    boundListener.notifyComputerRemoved(computer);
+                }
+            }
+
            @Override
            public void notifyDiscoveryFailure(Exception e) {
                if (boundListener != null) {
@@ -128,13 +128,6 @@ public class CachedAppAssetLoader {
            try {
                Thread.sleep((int) (1000 + (Math.random() * 500)));
            } catch (InterruptedException e) {
-                e.printStackTrace();
-
-                // InterruptedException clears the thread's interrupt status. Since we can't
-                // handle that here, we will re-interrupt the thread to set the interrupt
-                // status back to true.
-                Thread.currentThread().interrupt();
-
                return null;
            }
        }
@@ -154,15 +154,21 @@ public class DiskAssetLoader {
    }

    public void populateCacheWithStream(CachedAppAssetLoader.LoaderTuple tuple, InputStream input) {
+        OutputStream out = null;
        boolean success = false;
-        try (final OutputStream out = CacheHelper.openCacheFileForOutput(
-                cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png")
-        ) {
+        try {
+            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
            CacheHelper.writeInputStreamToOutputStream(input, out, MAX_ASSET_SIZE);
            success = true;
        } catch (IOException e) {
            e.printStackTrace();
        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException ignored) {}
+            }
+
            if (!success) {
                LimeLog.warning("Unable to populate cache with tuple: "+tuple);
                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
@@ -22,9 +22,8 @@ public class NetworkAssetLoader {
    public InputStream getBitmapStream(CachedAppAssetLoader.LoaderTuple tuple) {
        InputStream in = null;
        try {
-            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(tuple.computer),
-                    tuple.computer.httpsPort, uniqueId, tuple.computer.serverCert,
-                    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) {}

@@ -1,15 +1,11 @@
 package com.limelight.nvstream;

-import com.limelight.nvstream.http.ComputerDetails;
-
 import java.security.cert.X509Certificate;

 import javax.crypto.SecretKey;

 public class ConnectionContext {
-    public ComputerDetails.AddressTuple serverAddress;
-    public int httpsPort;
-    public boolean isNvidiaServerSoftware;
+    public String serverAddress;
    public X509Certificate serverCert;
    public StreamConfiguration streamConfig;
    public NvConnectionListener connListener;
@@ -26,8 +22,5 @@ public class ConnectionContext {
    public int negotiatedWidth, negotiatedHeight;
    public boolean negotiatedHdr;

-    public int negotiatedRemoteStreaming;
-    public int negotiatedPacketSize;
-
    public int videoCapabilities;
 }
@@ -1,26 +1,12 @@
 package com.limelight.nvstream;

 import android.app.ActivityManager;
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.IpPrefix;
-import android.net.LinkProperties;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.RouteInfo;
-import android.os.Build;

 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.Semaphore;

 import javax.crypto.KeyGenerator;
@@ -31,8 +17,7 @@ import org.xmlpull.v1.XmlPullParserException;
 import com.limelight.LimeLog;
 import com.limelight.nvstream.av.audio.AudioRenderer;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.HostHttpResponseException;
+import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.LimelightCryptoProvider;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
@@ -42,28 +27,26 @@ import com.limelight.nvstream.jni.MoonBridge;

 public class NvConnection {
    // Context parameters
+    private String host;
    private LimelightCryptoProvider cryptoProvider;
    private String uniqueId;
    private ConnectionContext context;
    private static Semaphore connectionAllowed = new Semaphore(1);
    private final boolean isMonkey;
-    private final Context appContext;
-
-    public NvConnection(Context appContext, ComputerDetails.AddressTuple host, int httpsPort, String uniqueId, StreamConfiguration config, LimelightCryptoProvider cryptoProvider, X509Certificate serverCert)
-    {
-        this.appContext = appContext;
+    
+    public NvConnection(String host, String uniqueId, StreamConfiguration config, LimelightCryptoProvider cryptoProvider, X509Certificate serverCert)
+    {       
+        this.host = host;
        this.cryptoProvider = cryptoProvider;
        this.uniqueId = uniqueId;

        this.context = new ConnectionContext();
-        this.context.serverAddress = host;
-        this.context.httpsPort = httpsPort;
        this.context.streamConfig = config;
        this.context.serverCert = serverCert;

        // This is unique per connection
        this.context.riKey = generateRiAesKey();
-        this.context.riKeyId = generateRiKeyId();
+        context.riKeyId = generateRiKeyId();

        this.isMonkey = ActivityManager.isUserAMonkey();
    }
@@ -100,130 +83,12 @@ public class NvConnection {
        // Now a pending connection can be processed
        connectionAllowed.release();
    }
-
-    private InetAddress resolveServerAddress() throws IOException {
-        // Try to find an address that works for this host
-        InetAddress[] addrs = InetAddress.getAllByName(context.serverAddress.address);
-        for (InetAddress addr : addrs) {
-            try (Socket s = new Socket()) {
-                s.setSoLinger(true, 0);
-                s.connect(new InetSocketAddress(addr, context.serverAddress.port), 1000);
-                return addr;
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        // If we made it here, we didn't manage to find a working address. If DNS returned any
-        // address, we'll use the first available address and hope for the best.
-        if (addrs.length > 0) {
-            return addrs[0];
-        }
-        else {
-            throw new IOException("No addresses found for "+context.serverAddress);
-        }
-    }
-
-    private int detectServerConnectionType() {
-        ConnectivityManager connMgr = (ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Network activeNetwork = connMgr.getActiveNetwork();
-            if (activeNetwork != null) {
-                NetworkCapabilities netCaps = connMgr.getNetworkCapabilities(activeNetwork);
-                if (netCaps != null) {
-                    if (netCaps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) ||
-                            !netCaps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)) {
-                        // VPNs are treated as remote connections
-                        return StreamConfiguration.STREAM_CFG_REMOTE;
-                    }
-                    else if (netCaps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-                        // Cellular is always treated as remote to avoid any possible
-                        // issues with 464XLAT or similar technologies.
-                        return StreamConfiguration.STREAM_CFG_REMOTE;
-                    }
-                }
-
-                // Check if the server address is on-link
-                LinkProperties linkProperties = connMgr.getLinkProperties(activeNetwork);
-                if (linkProperties != null) {
-                    InetAddress serverAddress;
-                    try {
-                        serverAddress = resolveServerAddress();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-
-                        // We can't decide without being able to resolve the server address
-                        return StreamConfiguration.STREAM_CFG_AUTO;
-                    }
-
-                    // If the address is in the NAT64 prefix, always treat it as remote
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                        IpPrefix nat64Prefix = linkProperties.getNat64Prefix();
-                        if (nat64Prefix != null && nat64Prefix.contains(serverAddress)) {
-                            return StreamConfiguration.STREAM_CFG_REMOTE;
-                        }
-                    }
-
-                    for (RouteInfo route : linkProperties.getRoutes()) {
-                        // Skip non-unicast routes (which are all we get prior to Android 13)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && route.getType() != RouteInfo.RTN_UNICAST) {
-                            continue;
-                        }
-
-                        // Find the first route that matches this address
-                        if (route.matches(serverAddress)) {
-                            // If there's no gateway, this is an on-link destination
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                                // We want to use hasGateway() because getGateway() doesn't adhere
-                                // to documented behavior of returning null for on-link addresses.
-                                if (!route.hasGateway()) {
-                                    return StreamConfiguration.STREAM_CFG_LOCAL;
-                                }
-                            }
-                            else {
-                                // getGateway() is documented to return null for on-link destinations,
-                                // but it actually returns the unspecified address (0.0.0.0 or ::).
-                                InetAddress gateway = route.getGateway();
-                                if (gateway == null || gateway.isAnyLocalAddress()) {
-                                    return StreamConfiguration.STREAM_CFG_LOCAL;
-                                }
-                            }
-
-                            // We _should_ stop after the first matching route, but for some reason
-                            // Android doesn't always report IPv6 routes in descending order of
-                            // specificity and metric. To handle that case, we enumerate all matching
-                            // routes, assuming that an on-link route will always be preferred.
-                        }
-                    }
-                }
-            }
-        }
-        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            NetworkInfo activeNetworkInfo = connMgr.getActiveNetworkInfo();
-            if (activeNetworkInfo != null) {
-                switch (activeNetworkInfo.getType()) {
-                    case ConnectivityManager.TYPE_VPN:
-                    case ConnectivityManager.TYPE_MOBILE:
-                    case ConnectivityManager.TYPE_MOBILE_DUN:
-                    case ConnectivityManager.TYPE_MOBILE_HIPRI:
-                    case ConnectivityManager.TYPE_MOBILE_MMS:
-                    case ConnectivityManager.TYPE_MOBILE_SUPL:
-                    case ConnectivityManager.TYPE_WIMAX:
-                        // VPNs and cellular connections are always remote connections
-                        return StreamConfiguration.STREAM_CFG_REMOTE;
-                }
-            }
-        }
-
-        // If we can't determine the connection type, let moonlight-common-c decide.
-        return StreamConfiguration.STREAM_CFG_AUTO;
-    }
    
    private boolean startApp() throws XmlPullParserException, IOException
    {
-        NvHTTP h = new NvHTTP(context.serverAddress, context.httpsPort, uniqueId, context.serverCert, cryptoProvider);
+        NvHTTP h = new NvHTTP(context.serverAddress, uniqueId, context.serverCert, cryptoProvider);

-        String serverInfo = h.getServerInfo(true);
+        String serverInfo = h.getServerInfo();
        
        context.serverAppVersion = h.getServerVersion(serverInfo);
        if (context.serverAppVersion == null) {
@@ -231,9 +96,6 @@ public class NvConnection {
            return false;
        }

-        ComputerDetails details = h.getComputerDetails(serverInfo);
-        context.isNvidiaServerSoftware = details.nvidiaServer;
-
        // May be missing for older servers
        context.serverGfeVersion = h.getGfeVersion(serverInfo);
                
@@ -276,18 +138,6 @@ public class NvConnection {
            context.negotiatedWidth = context.streamConfig.getWidth();
            context.negotiatedHeight = context.streamConfig.getHeight();
        }
-
-        // We will perform some connection type detection if the caller asked for it
-        if (context.streamConfig.getRemote() == StreamConfiguration.STREAM_CFG_AUTO) {
-            context.negotiatedRemoteStreaming = detectServerConnectionType();
-            context.negotiatedPacketSize =
-                    context.negotiatedRemoteStreaming == StreamConfiguration.STREAM_CFG_REMOTE ?
-                            1024 : context.streamConfig.getMaxPacketSize();
-        }
-        else {
-            context.negotiatedRemoteStreaming = context.streamConfig.getRemote();
-            context.negotiatedPacketSize = context.streamConfig.getMaxPacketSize();
-        }
        
        //
        // Video stream format will be decided during the RTSP handshake
@@ -309,14 +159,14 @@ public class NvConnection {
        if (h.getCurrentGame(serverInfo) != 0) {
            try {
                if (h.getCurrentGame(serverInfo) == app.getAppId()) {
-                    if (!h.launchApp(context, "resume", app.getAppId(), context.negotiatedHdr)) {
+                    if (!h.resumeApp(context)) {
                        context.connListener.displayMessage("Failed to resume existing session");
                        return false;
                    }
                } else {
                    return quitAndLaunch(h, context);
                }
-            } catch (HostHttpResponseException e) {
+            } catch (GfeHttpResponseException e) {
                if (e.getErrorCode() == 470) {
                    // This is the error you get when you try to resume a session that's not yours.
                    // Because this is fairly common, we'll display a more detailed message.
@@ -349,7 +199,7 @@ public class NvConnection {
                context.connListener.displayMessage("Failed to quit previous session! You must quit it manually");
                return false;
            } 
-        } catch (HostHttpResponseException e) {
+        } catch (GfeHttpResponseException e) {
            if (e.getErrorCode() == 599) {
                context.connListener.displayMessage("This session wasn't started by this device," +
                        " so it cannot be quit. End streaming on the original " +
@@ -367,7 +217,7 @@ public class NvConnection {
    private boolean launchNotRunningApp(NvHTTP h, ConnectionContext context)
            throws IOException, XmlPullParserException {
        // Launch the app since it's not running
-        if (!h.launchApp(context, "launch", context.streamConfig.getApp().getAppId(), context.negotiatedHdr)) {
+        if (!h.launchApp(context, context.streamConfig.getApp().getAppId(), context.negotiatedHdr)) {
            context.connListener.displayMessage("Failed to launch application");
            return false;
        }
@@ -386,6 +236,7 @@ public class NvConnection {

                String appName = context.streamConfig.getApp().getAppName();

+                context.serverAddress = host;
                context.connListener.stageStarting(appName);

                try {
@@ -394,7 +245,7 @@ public class NvConnection {
                        return;
                    }
                    context.connListener.stageComplete(appName);
-                } catch (HostHttpResponseException e) {
+                } catch (GfeHttpResponseException e) {
                    e.printStackTrace();
                    context.connListener.displayMessage(e.getMessage());
                    context.connListener.stageFailed(appName, 0, e.getErrorCode());
@@ -423,27 +274,24 @@ public class NvConnection {
                // we must not invoke that functionality in parallel.
                synchronized (MoonBridge.class) {
                    MoonBridge.setupBridge(videoDecoderRenderer, audioRenderer, connectionListener);
-                    int ret = MoonBridge.startConnection(context.serverAddress.address,
+                    int ret = MoonBridge.startConnection(context.serverAddress,
                            context.serverAppVersion, context.serverGfeVersion, context.rtspSessionUrl,
                            context.negotiatedWidth, context.negotiatedHeight,
                            context.streamConfig.getRefreshRate(), context.streamConfig.getBitrate(),
-                            context.negotiatedPacketSize, context.negotiatedRemoteStreaming,
-                            context.streamConfig.getAudioConfiguration().toInt(),
+                            context.streamConfig.getMaxPacketSize(),
+                            context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration().toInt(),
                            context.streamConfig.getHevcSupported(),
                            context.negotiatedHdr,
                            context.streamConfig.getHevcBitratePercentageMultiplier(),
                            context.streamConfig.getClientRefreshRateX100(),
                            context.streamConfig.getEncryptionFlags(),
                            context.riKey.getEncoded(), ib.array(),
-                            context.videoCapabilities,
-                            context.streamConfig.getColorSpace(),
-                            context.streamConfig.getColorRange());
+                            context.videoCapabilities);
                    if (ret != 0) {
                        // LiStartConnection() failed, so the caller is not expected
                        // to stop the connection themselves. We need to release their
                        // semaphore count for them.
                        connectionAllowed.release();
-                        return;
                    }
                }
            }
@@ -463,14 +311,7 @@ public class NvConnection {
            MoonBridge.sendMousePosition(x, y, referenceWidth, referenceHeight);
        }
    }
-
-    public void sendMouseMoveAsMousePosition(short deltaX, short deltaY, short referenceWidth, short referenceHeight)
-    {
-        if (!isMonkey) {
-            MoonBridge.sendMouseMoveAsMousePosition(deltaX, deltaY, referenceWidth, referenceHeight);
-        }
-    }
-
+    
    public void sendMouseButtonDown(final byte mouseButton)
    {
        if (!isMonkey) {
@@ -508,21 +349,15 @@ public class NvConnection {
        }
    }
    
-    public void sendKeyboardInput(final short keyMap, final byte keyDirection, final byte modifier, final byte flags) {
+    public void sendKeyboardInput(final short keyMap, final byte keyDirection, final byte modifier) {
        if (!isMonkey) {
-            MoonBridge.sendKeyboardInput(keyMap, keyDirection, modifier, flags);
+            MoonBridge.sendKeyboardInput(keyMap, keyDirection, modifier);
        }
    }
    
    public void sendMouseScroll(final byte scrollClicks) {
        if (!isMonkey) {
-            MoonBridge.sendMouseHighResScroll((short)(scrollClicks * 120)); // WHEEL_DELTA
-        }
-    }
-
-    public void sendMouseHScroll(final byte scrollClicks) {
-        if (!isMonkey) {
-            MoonBridge.sendMouseHighResHScroll((short)(scrollClicks * 120)); // WHEEL_DELTA
+            MoonBridge.sendMouseScroll(scrollClicks);
        }
    }

@@ -532,12 +367,6 @@ public class NvConnection {
        }
    }

-    public void sendMouseHighResHScroll(final short scrollAmount) {
-        if (!isMonkey) {
-            MoonBridge.sendMouseHighResHScroll(scrollAmount);
-        }
-    }
-
    public void sendUtf8Text(final String text) {
        if (!isMonkey) {
            MoonBridge.sendUtf8Text(text);
@@ -13,6 +13,4 @@ public interface NvConnectionListener {
    void displayTransientMessage(String message);

    void rumble(short controllerNumber, short lowFreqMotor, short highFreqMotor);
-
-    void setHdrMode(boolean enabled, byte[] hdrMetadata);
 }
@@ -27,9 +27,6 @@ public class StreamConfiguration {
    private boolean enableHdr;
    private int attachedGamepadMask;
    private int encryptionFlags;
-    private int colorRange;
-    private int colorSpace;
-    private boolean persistGamepadsAfterDisconnect;

    public static class Builder {
        private StreamConfiguration config = new StreamConfiguration();
@@ -110,11 +107,6 @@ public class StreamConfiguration {
            return this;
        }

-        public StreamConfiguration.Builder setPersistGamepadsAfterDisconnect(boolean value) {
-            config.persistGamepadsAfterDisconnect = value;
-            return this;
-        }
-
        public StreamConfiguration.Builder setClientRefreshRateX100(int refreshRateX100) {
            config.clientRefreshRateX100 = refreshRateX100;
            return this;
@@ -139,17 +131,7 @@ public class StreamConfiguration {
            config.supportsHevc = supportsHevc;
            return this;
        }
-
-        public StreamConfiguration.Builder setColorRange(int colorRange) {
-            config.colorRange = colorRange;
-            return this;
-        }
-
-        public StreamConfiguration.Builder setColorSpace(int colorSpace) {
-            config.colorSpace = colorSpace;
-            return this;
-        }
-
+        
        public StreamConfiguration build() {
            return config;
        }
@@ -237,10 +219,6 @@ public class StreamConfiguration {
        return attachedGamepadMask;
    }

-    public boolean getPersistGamepadsAfterDisconnect() {
-        return persistGamepadsAfterDisconnect;
-    }
-
    public int getClientRefreshRateX100() {
        return clientRefreshRateX100;
    }
@@ -248,12 +226,4 @@ public class StreamConfiguration {
    public int getEncryptionFlags() {
        return encryptionFlags;
    }
-
-    public int getColorRange() {
-        return colorRange;
-    }
-
-    public int getColorSpace() {
-        return colorSpace;
-    }
 }
@@ -10,11 +10,9 @@ public abstract class VideoDecoderRenderer {
    // This is called once for each frame-start NALU. This means it will be called several times
    // for an IDR frame which contains several parameter sets and the I-frame data.
    public abstract int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                         int frameNumber, int frameType, long receiveTimeMs, long enqueueTimeMs);
+                                         int frameNumber, long receiveTimeMs, long enqueueTimeMs);
    
    public abstract void cleanup();

    public abstract int getCapabilities();
-
-    public abstract void setHdrMode(boolean enabled, byte[] hdrMetadata);
 }
@@ -1,7 +1,6 @@
 package com.limelight.nvstream.http;

 import java.security.cert.X509Certificate;
-import java.util.Objects;


 public class ComputerDetails {
@@ -9,73 +8,22 @@ public class ComputerDetails {
        ONLINE, OFFLINE, UNKNOWN
    }

-    public static class AddressTuple {
-        public String address;
-        public int port;
-
-        public AddressTuple(String address, int port) {
-            if (address == null) {
-                throw new IllegalArgumentException("Address cannot be null");
-            }
-            if (port <= 0) {
-                throw new IllegalArgumentException("Invalid port");
-            }
-
-            // If this was an escaped IPv6 address, remove the brackets
-            if (address.startsWith("[") && address.endsWith("]")) {
-                address = address.substring(1, address.length() - 1);
-            }
-
-            this.address = address;
-            this.port = port;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(address, port);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof AddressTuple)) {
-                return false;
-            }
-
-            AddressTuple that = (AddressTuple) obj;
-            return address.equals(that.address) && port == that.port;
-        }
-
-        public String toString() {
-            if (address.contains(":")) {
-                // IPv6
-                return "[" + address + "]:" + port;
-            }
-            else {
-                // IPv4 and hostnames
-                return address + ":" + port;
-            }
-        }
-    }
-
    // Persistent attributes
    public String uuid;
    public String name;
-    public AddressTuple localAddress;
-    public AddressTuple remoteAddress;
-    public AddressTuple manualAddress;
-    public AddressTuple ipv6Address;
+    public String localAddress;
+    public String remoteAddress;
+    public String manualAddress;
+    public String ipv6Address;
    public String macAddress;
    public X509Certificate serverCert;

    // Transient attributes
    public State state;
-    public AddressTuple activeAddress;
-    public int httpsPort;
-    public int externalPort;
+    public String activeAddress;
    public PairingManager.PairState pairState;
    public int runningGameId;
    public String rawAppList;
-    public boolean nvidiaServer;

    public ComputerDetails() {
        // Use defaults
@@ -87,27 +35,6 @@ public class ComputerDetails {
        update(details);
    }

-    public int guessExternalPort() {
-        if (externalPort != 0) {
-            return externalPort;
-        }
-        else if (remoteAddress != null) {
-            return remoteAddress.port;
-        }
-        else if (activeAddress != null) {
-            return activeAddress.port;
-        }
-        else if (ipv6Address != null) {
-            return ipv6Address.port;
-        }
-        else if (localAddress != null) {
-            return localAddress.port;
-        }
-        else {
-            return NvHTTP.DEFAULT_HTTP_PORT;
-        }
-    }
-
    public void update(ComputerDetails details) {
        this.state = details.state;
        this.name = details.name;
@@ -116,18 +43,12 @@ public class ComputerDetails {
            this.activeAddress = details.activeAddress;
        }
        // We can get IPv4 loopback addresses with GS IPv6 Forwarder
-        if (details.localAddress != null && !details.localAddress.address.startsWith("127.")) {
+        if (details.localAddress != null && !details.localAddress.startsWith("127.")) {
            this.localAddress = details.localAddress;
        }
        if (details.remoteAddress != null) {
            this.remoteAddress = details.remoteAddress;
        }
-        else if (this.remoteAddress != null && details.externalPort != 0) {
-            // If we have a remote address already (perhaps via STUN) but our updated details
-            // don't have a new one (because GFE doesn't send one), propagate the external
-            // port to the current remote address. We may have tried to guess it previously.
-            this.remoteAddress.port = details.externalPort;
-        }
        if (details.manualAddress != null) {
            this.manualAddress = details.manualAddress;
        }
@@ -140,11 +61,8 @@ public class ComputerDetails {
        if (details.serverCert != null) {
            this.serverCert = details.serverCert;
        }
-        this.externalPort = details.externalPort;
-        this.httpsPort = details.httpsPort;
        this.pairState = details.pairState;
        this.runningGameId = details.runningGameId;
-        this.nvidiaServer = details.nvidiaServer;
        this.rawAppList = details.rawAppList;
    }

@@ -162,7 +80,6 @@ public class ComputerDetails {
        str.append("MAC Address: ").append(macAddress).append("\n");
        str.append("Pair State: ").append(pairState).append("\n");
        str.append("Running Game ID: ").append(runningGameId).append("\n");
-        str.append("HTTPS Port: ").append(httpsPort).append("\n");
        return str.toString();
    }
 }
@@ -2,13 +2,13 @@ package com.limelight.nvstream.http;

 import java.io.IOException;

-public class HostHttpResponseException extends IOException {
+public class GfeHttpResponseException extends IOException {
    private static final long serialVersionUID = 1543508830807804222L;
    
    private int errorCode;
    private String errorMsg;
    
-    public HostHttpResponseException(int errorCode, String errorMsg) {
+    public GfeHttpResponseException(int errorCode, String errorMsg) {
        this.errorCode = errorCode;
        this.errorMsg = errorMsg;
    }
@@ -23,6 +23,6 @@ public class HostHttpResponseException extends IOException {
    
    @Override
    public String getMessage() {
-        return "Host PC returned error: "+errorMsg+" (Error code: "+errorCode+")";
+        return "GeForce Experience returned error: "+errorMsg+" (Error code: "+errorCode+")";
    }
 }
@@ -63,7 +63,7 @@ public class NvApp {
    public String toString() {
        StringBuilder str = new StringBuilder();
        str.append("Name: ").append(appName).append("\n");
-        str.append("HDR Supported: ").append(hdrSupported ? "Yes" : "Unknown").append("\n");
+        str.append("HDR: ").append(hdrSupported ? "Yes" : "No").append("\n");
        str.append("ID: ").append(appId).append("\n");
        return str.toString();
    }
@@ -8,10 +8,11 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.net.Inet4Address;
 import java.net.InetAddress;
-import java.net.Proxy;
+import java.net.MalformedURLException;
 import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -52,7 +53,6 @@ import com.limelight.nvstream.ConnectionContext;
 import com.limelight.nvstream.http.PairingManager.PairState;

 import okhttp3.ConnectionPool;
-import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -63,22 +63,19 @@ public class NvHTTP {
    private String uniqueId;
    private PairingManager pm;

-    private static final int DEFAULT_HTTPS_PORT = 47984;
-    public static final int DEFAULT_HTTP_PORT = 47989;
-    public static final int SHORT_CONNECTION_TIMEOUT = 3000;
-    public static final int LONG_CONNECTION_TIMEOUT = 5000;
-    public static final int READ_TIMEOUT = 7000;
+    public static final int HTTPS_PORT = 47984;
+    public static final int HTTP_PORT = 47989;
+    public static final int CONNECTION_TIMEOUT = 3000;
+    public static final int READ_TIMEOUT = 5000;

    // Print URL and content to logcat on debug builds
    private static boolean verbose = BuildConfig.DEBUG;

-    private HttpUrl baseUrlHttp;
-
-    private int httpsPort;
+    public String baseUrlHttps;
+    public String baseUrlHttp;
    
-    private OkHttpClient httpClientLongConnectTimeout;
-    private OkHttpClient httpClientLongConnectNoReadTimeout;
-    private OkHttpClient httpClientShortConnectTimeout;
+    private OkHttpClient httpClient;
+    private OkHttpClient httpClientWithReadTimeout;

    private X509TrustManager defaultTrustManager;
    private X509TrustManager trustManager;
@@ -171,34 +168,19 @@ public class NvHTTP {
            }
        };

-        httpClientLongConnectTimeout = new OkHttpClient.Builder()
+        httpClient = new OkHttpClient.Builder()
                .connectionPool(new ConnectionPool(0, 1, TimeUnit.MILLISECONDS))
                .hostnameVerifier(hv)
-                .readTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS)
-                .connectTimeout(LONG_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-                .proxy(Proxy.NO_PROXY)
-                .build();
-
-        httpClientShortConnectTimeout = httpClientLongConnectTimeout.newBuilder()
-                .connectTimeout(SHORT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
-                .build();
-
-        httpClientLongConnectNoReadTimeout = httpClientLongConnectTimeout.newBuilder()
                .readTimeout(0, TimeUnit.MILLISECONDS)
+                .connectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
+                .build();
+        
+        httpClientWithReadTimeout = httpClient.newBuilder()
+                .readTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS)
                .build();
-    }
-
-    public HttpUrl getHttpsUrl(boolean likelyOnline) throws IOException {
-        if (httpsPort == 0) {
-            // Fetch the HTTPS port if we don't have it already
-            httpsPort = getHttpsPort(openHttpConnectionToString(likelyOnline ? httpClientLongConnectTimeout : httpClientShortConnectTimeout,
-                    baseUrlHttp, "serverinfo"));
-        }
-
-        return new HttpUrl.Builder().scheme("https").host(baseUrlHttp.host()).port(httpsPort).build();
    }
    
-    public NvHTTP(ComputerDetails.AddressTuple address, int httpsPort, String uniqueId, X509Certificate serverCert, LimelightCryptoProvider cryptoProvider) throws IOException {
+    public NvHTTP(String address, String uniqueId, X509Certificate serverCert, LimelightCryptoProvider cryptoProvider) throws IOException {
        // Use the same UID for all Moonlight clients so we can quit games
        // started by other Moonlight clients.
        this.uniqueId = "0123456789ABCDEF";
@@ -207,35 +189,23 @@ public class NvHTTP {

        initializeHttpState(cryptoProvider);

-        this.httpsPort = httpsPort;
-
        try {
-            // If this is an IPv4-mapped IPv6 address, OkHTTP will choke on it if it's
-            // in IPv6 form, because InetAddress.getByName() will return an Inet4Address
-            // for what OkHTTP thinks is an IPv6 address. Normalize it into IPv4 form
-            // to avoid triggering this bug.
-            String addressString = address.address;
-            if (addressString.contains(":") && addressString.contains(".")) {
-                InetAddress addr = InetAddress.getByName(addressString);
-                if (addr instanceof Inet4Address) {
-                    addressString = ((Inet4Address)addr).getHostAddress();
-                }
-            }
-
-            this.baseUrlHttp = new HttpUrl.Builder()
-                    .scheme("http")
-                    .host(addressString)
-                    .port(address.port)
-                    .build();
-        } catch (IllegalArgumentException e) {
-            // Encapsulate IllegalArgumentException into IOException for callers to handle more easily
+            // The URI constructor takes care of escaping IPv6 literals
+            this.baseUrlHttps = new URI("https", null, address, HTTPS_PORT, null, null, null).toString();
+            this.baseUrlHttp = new URI("http", null, address, HTTP_PORT, null, null, null).toString();
+        } catch (URISyntaxException e) {
+            // Encapsulate URISyntaxException into IOException for callers to handle more easily
            throw new IOException(e);
        }

        this.pm = new PairingManager(this, cryptoProvider);
    }
-
-    static String getXmlString(Reader r, String tagname, boolean throwIfMissing) throws XmlPullParserException, IOException {
+    
+    String buildUniqueIdUuidString() {
+        return "uniqueid="+uniqueId+"&uuid="+UUID.randomUUID();
+    }
+    
+    static String getXmlString(Reader r, String tagname) throws XmlPullParserException, IOException {
        XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
        factory.setNamespaceAware(true);
        XmlPullParser xpp = factory.newPullParser();
@@ -264,22 +234,14 @@ public class NvHTTP {
            eventType = xpp.next();
        }

-        if (throwIfMissing) {
-            // We throw an XmlPullParserException here for ease of handling in all the various callers.
-            // We could also throw an IOException, but some callers expect those in cases where the
-            // host may not be reachable. We want to distinguish unreachable hosts vs. hosts that
-            // are returning garbage XML to us, so we use XmlPullParserException instead.
-            throw new XmlPullParserException("Missing mandatory field in host response: "+tagname);
-        }
-
        return null;
    }

-    static String getXmlString(String str, String tagname, boolean throwIfMissing) throws XmlPullParserException, IOException {
-        return getXmlString(new StringReader(str), tagname, throwIfMissing);
+    static String getXmlString(String str, String tagname) throws XmlPullParserException, IOException {
+        return getXmlString(new StringReader(str), tagname);
    }
    
-    private static void verifyResponseStatus(XmlPullParser xpp) throws HostHttpResponseException {
+    private static void verifyResponseStatus(XmlPullParser xpp) throws GfeHttpResponseException {
        // We use Long.parseLong() because in rare cases GFE can send back a status code of
        // 0xFFFFFFFF, which will cause Integer.parseInt() to throw a NumberFormatException due
        // to exceeding Integer.MAX_VALUE. We'll get the desired error code of -1 by just casting
@@ -293,15 +255,12 @@ public class NvHTTP {
                statusCode = 418;
                statusMsg = "Missing audio capture device. Reinstall GeForce Experience.";
            }
-            throw new HostHttpResponseException(statusCode, statusMsg);
+            throw new GfeHttpResponseException(statusCode, statusMsg);
        }
    }
    
-    public String getServerInfo(boolean likelyOnline) throws IOException, XmlPullParserException {
+    public String getServerInfo() throws IOException, XmlPullParserException {
        String resp;
-
-        // If we believe the PC is online, give it a little extra time to respond
-        OkHttpClient client = likelyOnline ? httpClientLongConnectTimeout : httpClientShortConnectTimeout;
        
        //
        // TODO: Shield Hub uses HTTP for this and is able to get an accurate PairStatus with HTTP.
@@ -313,13 +272,13 @@ public class NvHTTP {
        if (serverCert != null) {
            try {
                try {
-                    resp = openHttpConnectionToString(client, getHttpsUrl(likelyOnline), "serverinfo");
+                    resp = openHttpConnectionToString(baseUrlHttps + "/serverinfo?"+buildUniqueIdUuidString(), true);
                } catch (SSLHandshakeException e) {
                    // Detect if we failed due to a server cert mismatch
                    if (e.getCause() instanceof CertificateException) {
                        // Jump to the GfeHttpResponseException exception handler to retry
                        // over HTTP which will allow us to pair again to update the cert
-                        throw new HostHttpResponseException(401, "Server certificate mismatch");
+                        throw new GfeHttpResponseException(401, "Server certificate mismatch");
                    }
                    else {
                        throw e;
@@ -330,10 +289,10 @@ public class NvHTTP {
                // We want this because it will throw us into the HTTP case if the client is unpaired.
                getServerVersion(resp);
            }
-            catch (HostHttpResponseException e) {
+            catch (GfeHttpResponseException e) {
                if (e.getErrorCode() == 401) {
                    // Cert validation error - fall back to HTTP
-                    return openHttpConnectionToString(client, baseUrlHttp, "serverinfo");
+                    return openHttpConnectionToString(baseUrlHttp + "/serverinfo", true);
                }

                // If it's not a cert validation error, throw it
@@ -344,55 +303,36 @@ public class NvHTTP {
        }
        else {
            // No pinned cert, so use HTTP
-            return openHttpConnectionToString(client, baseUrlHttp, "serverinfo");
+            return openHttpConnectionToString(baseUrlHttp + "/serverinfo", true);
        }
    }
-
-    private static ComputerDetails.AddressTuple makeTuple(String address, int port) {
-        if (address == null) {
-            return null;
-        }
-
-        return new ComputerDetails.AddressTuple(address, port);
-    }
-
-    public ComputerDetails getComputerDetails(String serverInfo) throws IOException, XmlPullParserException {
+    
+    public ComputerDetails getComputerDetails() throws IOException, XmlPullParserException {
        ComputerDetails details = new ComputerDetails();
-
-        details.name = getXmlString(serverInfo, "hostname", false);
+        String serverInfo = getServerInfo();
+        
+        details.name = getXmlString(serverInfo, "hostname");
        if (details.name == null || details.name.isEmpty()) {
            details.name = "UNKNOWN";
        }

-        // UUID is mandatory to determine which machine is responding
-        details.uuid = getXmlString(serverInfo, "uniqueid", true);
+        details.uuid = getXmlString(serverInfo, "uniqueid");
+        details.macAddress = getXmlString(serverInfo, "mac");
+        details.localAddress = getXmlString(serverInfo, "LocalIP");

-        details.httpsPort = getHttpsPort(serverInfo);
-
-        details.macAddress = getXmlString(serverInfo, "mac", false);
-
-        // FIXME: Do we want to use the current port?
-        details.localAddress = makeTuple(getXmlString(serverInfo, "LocalIP", false), baseUrlHttp.port());
-
-        // This is missing on on recent GFE versions, but it's present on Sunshine
-        details.externalPort = getExternalPort(serverInfo);
-        details.remoteAddress = makeTuple(getXmlString(serverInfo, "ExternalIP", false), details.externalPort);
+        // This may be null, but that's okay
+        details.remoteAddress = getXmlString(serverInfo, "ExternalIP");

+        // This has some extra logic to always report unpaired if the pinned cert isn't there
        details.pairState = getPairState(serverInfo);
+        
        details.runningGameId = getCurrentGame(serverInfo);
-
-        // The MJOLNIR codename was used by GFE but never by any third-party server
-        details.nvidiaServer = getXmlString(serverInfo, "state", true).contains("MJOLNIR");
-
+        
        // We could reach it so it's online
        details.state = ComputerDetails.State.ONLINE;
-
+        
        return details;
    }
-    
-    public ComputerDetails getComputerDetails(boolean likelyOnline) throws IOException, XmlPullParserException {
-        return getComputerDetails(getServerInfo(likelyOnline));
-    }

    // This hack is Android-specific but we do it on all platforms
    // because it doesn't really matter
@@ -417,27 +357,20 @@ public class NvHTTP {
        }
    }

-    private HttpUrl getCompleteUrl(HttpUrl baseUrl, String path, String query) {
-        return baseUrl.newBuilder()
-                .addPathSegment(path)
-                .query(query)
-                .addQueryParameter("uniqueid", uniqueId)
-                .addQueryParameter("uuid", UUID.randomUUID().toString())
-                .build();
-    }
-
-    private ResponseBody openHttpConnection(OkHttpClient client, HttpUrl baseUrl, String path) throws IOException {
-        return openHttpConnection(client, baseUrl, path, null);
-    }
-
    // Read timeout should be enabled for any HTTP query that requires no outside action
    // on the GFE server. Examples of queries that DO require outside action are launch, resume, and quit.
    // The initial pair query does require outside action (user entering a PIN) but subsequent pairing
    // queries do not.
-    private ResponseBody openHttpConnection(OkHttpClient client, HttpUrl baseUrl, String path, String query) throws IOException {
-        HttpUrl completeUrl = getCompleteUrl(baseUrl, path, query);
-        Request request = new Request.Builder().url(completeUrl).get().build();
-        Response response = performAndroidTlsHack(client).newCall(request).execute();
+    private ResponseBody openHttpConnection(String url, boolean enableReadTimeout) throws IOException {
+        Request request = new Request.Builder().url(url).get().build();
+        Response response;
+
+        if (enableReadTimeout) {
+            response = performAndroidTlsHack(httpClientWithReadTimeout).newCall(request).execute();
+        }
+        else {
+            response = performAndroidTlsHack(httpClient).newCall(request).execute();
+        }

        ResponseBody body = response.body();
        
@@ -451,31 +384,30 @@ public class NvHTTP {
        }
        
        if (response.code() == 404) {
-            throw new FileNotFoundException(completeUrl.toString());
+            throw new FileNotFoundException(url);
        }
        else {
-            throw new HostHttpResponseException(response.code(), response.message());
+            throw new GfeHttpResponseException(response.code(), response.message());
        }
    }
-
-    private String openHttpConnectionToString(OkHttpClient client, HttpUrl baseUrl, String path) throws IOException {
-        return openHttpConnectionToString(client, baseUrl, path, null);
-    }
-
-    private String openHttpConnectionToString(OkHttpClient client, HttpUrl baseUrl, String path, String query) throws IOException {
+    
+    String openHttpConnectionToString(String url, boolean enableReadTimeout) throws IOException {
        try {
-            ResponseBody resp = openHttpConnection(client, baseUrl, path, query);
+            if (verbose) {
+                LimeLog.info("Requesting URL: "+url);
+            }
+
+            ResponseBody resp = openHttpConnection(url, enableReadTimeout);
            String respString = resp.string();
            resp.close();

-            if (verbose && !path.equals("serverinfo")) {
-                LimeLog.info(getCompleteUrl(baseUrl, path, query)+" -> "+respString);
+            if (verbose) {
+                LimeLog.info(url+" -> "+respString);
            }

            return respString;
        } catch (IOException e) {
-            if (verbose && !path.equals("serverinfo")) {
-                LimeLog.warning(getCompleteUrl(baseUrl, path, query)+" -> "+e.getMessage());
+            if (verbose) {
                e.printStackTrace();
            }
            
@@ -484,23 +416,23 @@ public class NvHTTP {
    }

    public String getServerVersion(String serverInfo) throws XmlPullParserException, IOException {
-        // appversion is present in all supported GFE versions
-        return getXmlString(serverInfo, "appversion", true);
+        return getXmlString(serverInfo, "appversion");
    }

    public PairingManager.PairState getPairState() throws IOException, XmlPullParserException {
-        return getPairState(getServerInfo(true));
+        return getPairState(getServerInfo());
    }

    public PairingManager.PairState getPairState(String serverInfo) throws IOException, XmlPullParserException {
-        // appversion is present in all supported GFE versions
-        return NvHTTP.getXmlString(serverInfo, "PairStatus", true).equals("1") ?
-                PairState.PAIRED : PairState.NOT_PAIRED;
+        if (!NvHTTP.getXmlString(serverInfo, "PairStatus").equals("1")) {
+            return PairState.NOT_PAIRED;
+        }
+
+        return PairState.PAIRED;
    }
    
    public long getMaxLumaPixelsH264(String serverInfo) throws XmlPullParserException, IOException {
-        // MaxLumaPixelsH264 wasn't present on old GFE versions
-        String str = getXmlString(serverInfo, "MaxLumaPixelsH264", false);
+        String str = getXmlString(serverInfo, "MaxLumaPixelsH264");
        if (str != null) {
            return Long.parseLong(str);
        } else {
@@ -509,8 +441,7 @@ public class NvHTTP {
    }
    
    public long getMaxLumaPixelsHEVC(String serverInfo) throws XmlPullParserException, IOException {
-        // MaxLumaPixelsHEVC wasn't present on old GFE versions
-        String str = getXmlString(serverInfo, "MaxLumaPixelsHEVC", false);
+        String str = getXmlString(serverInfo, "MaxLumaPixelsHEVC");
        if (str != null) {
            return Long.parseLong(str);
        } else {
@@ -527,8 +458,7 @@ public class NvHTTP {
    // Bit 10: HEVC Main10 4:4:4
    // Bit 11: ???
    public long getServerCodecModeSupport(String serverInfo) throws XmlPullParserException, IOException {
-        // ServerCodecModeSupport wasn't present on old GFE versions
-        String str = getXmlString(serverInfo, "ServerCodecModeSupport", false);
+        String str = getXmlString(serverInfo, "ServerCodecModeSupport");
        if (str != null) {
            return Long.parseLong(str);
        } else {
@@ -537,18 +467,16 @@ public class NvHTTP {
    }
    
    public String getGpuType(String serverInfo) throws XmlPullParserException, IOException {
-        // ServerCodecModeSupport wasn't present on old GFE versions
-        return getXmlString(serverInfo, "gputype", false);
+        return getXmlString(serverInfo, "gputype");
    }

    public String getGfeVersion(String serverInfo) throws XmlPullParserException, IOException {
-        // ServerCodecModeSupport wasn't present on old GFE versions
-        return getXmlString(serverInfo, "GfeVersion", false);
+        return getXmlString(serverInfo, "GfeVersion");
    }
    
    public boolean supports4K(String serverInfo) throws XmlPullParserException, IOException {
-        // Only allow 4K on GFE 3.x. GfeVersion wasn't present on very old versions of GFE.
-        String gfeVersionStr = getXmlString(serverInfo, "GfeVersion", false);
+        // Only allow 4K on GFE 3.x
+        String gfeVersionStr = getXmlString(serverInfo, "GfeVersion");
        if (gfeVersionStr == null || gfeVersionStr.startsWith("2.")) {
            return false;
        }
@@ -560,40 +488,16 @@ public class NvHTTP {
        // GFE 2.8 started keeping currentgame set to the last game played. As a result, it no longer
        // has the semantics that its name would indicate. To contain the effects of this change as much
        // as possible, we'll force the current game to zero if the server isn't in a streaming session.
-        if (getXmlString(serverInfo, "state", true).endsWith("_SERVER_BUSY")) {
-            return Integer.parseInt(getXmlString(serverInfo, "currentgame", true));
+        String serverState = getXmlString(serverInfo, "state");
+        if (serverState != null && serverState.endsWith("_SERVER_BUSY")) {
+            String game = getXmlString(serverInfo, "currentgame");
+            return Integer.parseInt(game);
        }
        else {
            return 0;
        }
    }

-    public int getHttpsPort(String serverInfo) {
-        try {
-            return Integer.parseInt(getXmlString(serverInfo, "HttpsPort", true));
-        } catch (XmlPullParserException e) {
-            e.printStackTrace();
-            return DEFAULT_HTTPS_PORT;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return DEFAULT_HTTPS_PORT;
-        }
-    }
-
-    public int getExternalPort(String serverInfo) {
-        // This is an extension which is not present in GFE. It is present for Sunshine to be able
-        // to support dynamic HTTP WAN ports without requiring the user to manually enter the port.
-        try {
-            return Integer.parseInt(getXmlString(serverInfo, "ExternalPort", true));
-        } catch (XmlPullParserException e) {
-            // Expected on non-Sunshine servers
-            return baseUrlHttp.port();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return baseUrlHttp.port();
-        }
-    }
-
    public NvApp getAppById(int appId) throws IOException, XmlPullParserException {
        LinkedList<NvApp> appList = getAppList();
        for (NvApp appFromList : appList) {
@@ -684,38 +588,30 @@ public class NvHTTP {
        return appList;
    }
    
-    public String getAppListRaw() throws IOException {
-        return openHttpConnectionToString(httpClientLongConnectTimeout, getHttpsUrl(true), "applist");
+    public String getAppListRaw() throws MalformedURLException, IOException {
+        return openHttpConnectionToString(baseUrlHttps + "/applist?"+buildUniqueIdUuidString(), true);
    }
    
-    public LinkedList<NvApp> getAppList() throws HostHttpResponseException, IOException, XmlPullParserException {
+    public LinkedList<NvApp> getAppList() throws GfeHttpResponseException, IOException, XmlPullParserException {
        if (verbose) {
            // Use the raw function so the app list is printed
            return getAppListByReader(new StringReader(getAppListRaw()));
        }
        else {
-            try (final ResponseBody resp = openHttpConnection(httpClientLongConnectTimeout, getHttpsUrl(true), "applist")) {
-                return getAppListByReader(new InputStreamReader(resp.byteStream()));
-            }
+            ResponseBody resp = openHttpConnection(baseUrlHttps + "/applist?" + buildUniqueIdUuidString(), true);
+            LinkedList<NvApp> appList = getAppListByReader(new InputStreamReader(resp.byteStream()));
+            resp.close();
+            return appList;
        }
    }
-
-    String executePairingCommand(String additionalArguments, boolean enableReadTimeout) throws HostHttpResponseException, IOException {
-        return openHttpConnectionToString(enableReadTimeout ? httpClientLongConnectTimeout : httpClientLongConnectNoReadTimeout,
-                baseUrlHttp, "pair", "devicename=roth&updateState=1&" + additionalArguments);
-    }
-
-    String executePairingChallenge() throws HostHttpResponseException, IOException {
-        return openHttpConnectionToString(httpClientLongConnectTimeout, getHttpsUrl(true),
-                "pair", "devicename=roth&updateState=1&phrase=pairchallenge");
-    }
-
+    
    public void unpair() throws IOException {
-        openHttpConnectionToString(httpClientLongConnectTimeout, baseUrlHttp, "unpair");
+        openHttpConnectionToString(baseUrlHttp + "/unpair?"+buildUniqueIdUuidString(), true);
    }
    
    public InputStream getBoxArt(NvApp app) throws IOException {
-        ResponseBody resp = openHttpConnection(httpClientLongConnectTimeout, getHttpsUrl(true), "appasset", "appid=" + app.getAppId() + "&AssetType=2&AssetIdx=0");
+        ResponseBody resp = openHttpConnection(baseUrlHttps + "/appasset?"+ buildUniqueIdUuidString() +
+                "&appid=" + app.getAppId() + "&AssetType=2&AssetIdx=0", true);
        return resp.byteStream();
    }
    
@@ -750,31 +646,29 @@ public class NvHTTP {
        return new String(hexChars);
    }
    
-    public boolean launchApp(ConnectionContext context, String verb, int appId, boolean enableHdr) throws IOException, XmlPullParserException {
+    public boolean launchApp(ConnectionContext context, int appId, boolean enableHdr) throws IOException, XmlPullParserException {
        // Using an FPS value over 60 causes SOPS to default to 720p60,
        // so force it to 0 to ensure the correct resolution is set. We
        // used to use 60 here but that locked the frame rate to 60 FPS
        // on GFE 3.20.3.
-        int fps = context.isNvidiaServerSoftware && context.streamConfig.getLaunchRefreshRate() > 60 ?
-                0 : context.streamConfig.getLaunchRefreshRate();
+        int fps = context.streamConfig.getLaunchRefreshRate() > 60 ? 0 : context.streamConfig.getLaunchRefreshRate();

+        // Using an unsupported resolution (not 720p, 1080p, or 4K) causes
+        // GFE to force SOPS to 720p60. This is fine for < 720p resolutions like
+        // 360p or 480p, but it is not ideal for 1440p and other resolutions.
+        // When we detect an unsupported resolution, disable SOPS unless it's under 720p.
+        // FIXME: Detect support resolutions using the serverinfo response, not a hardcoded list
        boolean enableSops = context.streamConfig.getSops();
-        if (context.isNvidiaServerSoftware) {
-            // Using an unsupported resolution (not 720p, 1080p, or 4K) causes
-            // GFE to force SOPS to 720p60. This is fine for < 720p resolutions like
-            // 360p or 480p, but it is not ideal for 1440p and other resolutions.
-            // When we detect an unsupported resolution, disable SOPS unless it's under 720p.
-            // FIXME: Detect support resolutions using the serverinfo response, not a hardcoded list
-            if (context.negotiatedWidth * context.negotiatedHeight > 1280 * 720 &&
-                    context.negotiatedWidth * context.negotiatedHeight != 1920 * 1080 &&
-                    context.negotiatedWidth * context.negotiatedHeight != 3840 * 2160) {
-                LimeLog.info("Disabling SOPS due to non-standard resolution: "+context.negotiatedWidth+"x"+context.negotiatedHeight);
-                enableSops = false;
-            }
+        if (context.negotiatedWidth * context.negotiatedHeight > 1280 * 720 &&
+                context.negotiatedWidth * context.negotiatedHeight != 1920 * 1080 &&
+                context.negotiatedWidth * context.negotiatedHeight != 3840 * 2160) {
+            LimeLog.info("Disabling SOPS due to non-standard resolution: "+context.negotiatedWidth+"x"+context.negotiatedHeight);
+            enableSops = false;
        }

-        String xmlStr = openHttpConnectionToString(httpClientLongConnectNoReadTimeout, getHttpsUrl(true), verb,
-            "appid=" + appId +
+        String xmlStr = openHttpConnectionToString(baseUrlHttps +
+            "/launch?" + buildUniqueIdUuidString() +
+            "&appid=" + appId +
            "&mode=" + context.negotiatedWidth + "x" + context.negotiatedHeight + "x" + fps +
            "&additionalStates=1&sops=" + (enableSops ? 1 : 0) +
            "&rikey="+bytesToHex(context.riKey.getEncoded()) +
@@ -782,13 +676,28 @@ public class NvHTTP {
            (!enableHdr ? "" : "&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0") +
            "&localAudioPlayMode=" + (context.streamConfig.getPlayLocalAudio() ? 1 : 0) +
            "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo() +
-            "&remoteControllersBitmap=" + context.streamConfig.getAttachedGamepadMask() +
-            "&gcmap=" + context.streamConfig.getAttachedGamepadMask() +
-            "&gcpersist="+(context.streamConfig.getPersistGamepadsAfterDisconnect() ? 1 : 0));
-        if ((verb.equals("launch") && !getXmlString(xmlStr, "gamesession", true).equals("0") ||
-                (verb.equals("resume") && !getXmlString(xmlStr, "resume", true).equals("0")))) {
-            // sessionUrl0 will be missing for older GFE versions
-            context.rtspSessionUrl = getXmlString(xmlStr, "sessionUrl0", false);
+            (context.streamConfig.getAttachedGamepadMask() != 0 ? "&remoteControllersBitmap=" + context.streamConfig.getAttachedGamepadMask() : "") +
+            (context.streamConfig.getAttachedGamepadMask() != 0 ? "&gcmap=" + context.streamConfig.getAttachedGamepadMask() : ""),
+            false);
+        String gameSession = getXmlString(xmlStr, "gamesession");
+        if (gameSession != null && !gameSession.equals("0")) {
+            context.rtspSessionUrl = getXmlString(xmlStr, "sessionUrl0");
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    
+    public boolean resumeApp(ConnectionContext context) throws IOException, XmlPullParserException {
+        String xmlStr = openHttpConnectionToString(baseUrlHttps + "/resume?" + buildUniqueIdUuidString() +
+                "&rikey="+bytesToHex(context.riKey.getEncoded()) +
+                "&rikeyid="+context.riKeyId +
+                "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo(),
+                false);
+        String resume = getXmlString(xmlStr, "resume");
+        if (Integer.parseInt(resume) != 0) {
+            context.rtspSessionUrl = getXmlString(xmlStr, "sessionUrl0");
            return true;
        }
        else {
@@ -797,17 +706,18 @@ public class NvHTTP {
    }
    
    public boolean quitApp() throws IOException, XmlPullParserException {
-        String xmlStr = openHttpConnectionToString(httpClientLongConnectNoReadTimeout, getHttpsUrl(true), "cancel");
-        if (getXmlString(xmlStr, "cancel", true).equals("0")) {
+        String xmlStr = openHttpConnectionToString(baseUrlHttps + "/cancel?" + buildUniqueIdUuidString(), false);
+        String cancel = getXmlString(xmlStr, "cancel");
+        if (Integer.parseInt(cancel) == 0) {
            return false;
        }

        // Newer GFE versions will just return success even if quitting fails
        // if we're not the original requestor.
-        if (getCurrentGame(getServerInfo(true)) != 0) {
+        if (getCurrentGame(getServerInfo()) != 0) {
            // Generate a synthetic GfeResponseException letting the caller know
            // that they can't kill someone else's stream.
-            throw new HostHttpResponseException(599, "");
+            throw new GfeHttpResponseException(599, "");
        }

        return true;
@@ -1,8 +1,8 @@
 package com.limelight.nvstream.http;

-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;

 import org.xmlpull.v1.XmlPullParserException;

@@ -21,6 +21,7 @@ public class PairingManager {
    
    private PrivateKey pk;
    private X509Certificate cert;
+    private SecretKey aesKey;
    private byte[] pemCertBytes;

    private X509Certificate serverCert;
@@ -67,8 +68,7 @@ public class PairingManager {
    
    private X509Certificate extractPlainCert(String text) throws XmlPullParserException, IOException
    {
-        // Plaincert may be null if another client is already trying to pair
-        String certText = NvHTTP.getXmlString(text, "plaincert", false);
+        String certText = NvHTTP.getXmlString(text, "plaincert");
        if (certText != null) {
            byte[] certBytes = hexToBytes(certText);

@@ -124,35 +124,43 @@ public class PairingManager {
            throw new RuntimeException(e);
        }
    }
+    
+    private static byte[] decryptAes(byte[] encryptedData, SecretKey secretKey) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        
+            int blockRoundedSize = ((encryptedData.length + 15) / 16) * 16;
+            byte[] blockRoundedEncrypted = Arrays.copyOf(encryptedData, blockRoundedSize);
+            byte[] fullDecrypted = new byte[blockRoundedSize];

-    private static byte[] performBlockCipher(BlockCipher blockCipher, byte[] input) {
-        int blockSize = blockCipher.getBlockSize();
-        int blockRoundedSize = (input.length + (blockSize - 1)) & ~(blockSize - 1);
-
-        byte[] blockRoundedInputData = Arrays.copyOf(input, blockRoundedSize);
-        byte[] blockRoundedOutputData = new byte[blockRoundedSize];
-
-        for (int offset = 0; offset < blockRoundedSize; offset += blockSize) {
-            blockCipher.processBlock(blockRoundedInputData, offset, blockRoundedOutputData, offset);
+            cipher.init(Cipher.DECRYPT_MODE, secretKey);
+            cipher.doFinal(blockRoundedEncrypted, 0,
+                    blockRoundedSize, fullDecrypted);
+            return fullDecrypted;
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
        }
+    }
+    
+    private static byte[] encryptAes(byte[] data, SecretKey secretKey) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        
+            int blockRoundedSize = ((data.length + 15) / 16) * 16;
+            byte[] blockRoundedData = Arrays.copyOf(data, blockRoundedSize);

-        return blockRoundedOutputData;
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+            return cipher.doFinal(blockRoundedData);
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
    }
    
-    private static byte[] decryptAes(byte[] encryptedData, byte[] aesKey) {
-        BlockCipher aesEngine = new AESLightEngine();
-        aesEngine.init(false, new KeyParameter(aesKey));
-        return performBlockCipher(aesEngine, encryptedData);
-    }
-    
-    private static byte[] encryptAes(byte[] plaintextData, byte[] aesKey) {
-        BlockCipher aesEngine = new AESLightEngine();
-        aesEngine.init(true, new KeyParameter(aesKey));
-        return performBlockCipher(aesEngine, plaintextData);
-    }
-    
-    private static byte[] generateAesKey(PairingHashAlgorithm hashAlgo, byte[] keyData) {
-        return Arrays.copyOf(hashAlgo.hashData(keyData), 16);
+    private static SecretKey generateAesKey(PairingHashAlgorithm hashAlgo, byte[] keyData) {
+        byte[] aesTruncated = Arrays.copyOf(hashAlgo.hashData(keyData), 16);
+        return new SecretKeySpec(aesTruncated, "AES");
    }
    
    private static byte[] concatBytes(byte[] a, byte[] b) {
@@ -191,14 +199,16 @@ public class PairingManager {
        byte[] salt = generateRandomBytes(16);

        // Combine the salt and pin, then create an AES key from them
-        byte[] aesKey = generateAesKey(hashAlgo, saltPin(salt, pin));
+        byte[] saltAndPin = saltPin(salt, pin);
+        aesKey = generateAesKey(hashAlgo, saltAndPin);
        
        // Send the salt and get the server cert. This doesn't have a read timeout
        // because the user must enter the PIN before the server responds
-        String getCert = http.executePairingCommand("phrase=getservercert&salt="+
+        String getCert = http.openHttpConnectionToString(http.baseUrlHttp +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&phrase=getservercert&salt="+
                bytesToHex(salt)+"&clientcert="+bytesToHex(pemCertBytes),
                false);
-        if (!NvHTTP.getXmlString(getCert, "paired", true).equals("1")) {
+        if (!NvHTTP.getXmlString(getCert, "paired").equals("1")) {
            return PairState.FAILED;
        }

@@ -207,7 +217,7 @@ public class PairingManager {
        if (serverCert == null) {
            // Attempting to pair while another device is pairing will cause GFE
            // to give an empty cert in the response.
-            http.unpair();
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            return PairState.ALREADY_IN_PROGRESS;
        }

@@ -219,14 +229,16 @@ public class PairingManager {
        byte[] encryptedChallenge = encryptAes(randomChallenge, aesKey);
        
        // Send the encrypted challenge to the server
-        String challengeResp = http.executePairingCommand("clientchallenge="+bytesToHex(encryptedChallenge), true);
-        if (!NvHTTP.getXmlString(challengeResp, "paired", true).equals("1")) {
-            http.unpair();
+        String challengeResp = http.openHttpConnectionToString(http.baseUrlHttp + 
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&clientchallenge="+bytesToHex(encryptedChallenge),
+                true);
+        if (!NvHTTP.getXmlString(challengeResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            return PairState.FAILED;
        }
        
        // Decode the server's response and subsequent challenge
-        byte[] encServerChallengeResponse = hexToBytes(NvHTTP.getXmlString(challengeResp, "challengeresponse", true));
+        byte[] encServerChallengeResponse = hexToBytes(NvHTTP.getXmlString(challengeResp, "challengeresponse"));
        byte[] decServerChallengeResponse = decryptAes(encServerChallengeResponse, aesKey);
        
        byte[] serverResponse = Arrays.copyOfRange(decServerChallengeResponse, 0, hashAlgo.getHashLength());
@@ -236,21 +248,23 @@ public class PairingManager {
        byte[] clientSecret = generateRandomBytes(16);
        byte[] challengeRespHash = hashAlgo.hashData(concatBytes(concatBytes(serverChallenge, cert.getSignature()), clientSecret));
        byte[] challengeRespEncrypted = encryptAes(challengeRespHash, aesKey);
-        String secretResp = http.executePairingCommand("serverchallengeresp="+bytesToHex(challengeRespEncrypted), true);
-        if (!NvHTTP.getXmlString(secretResp, "paired", true).equals("1")) {
-            http.unpair();
+        String secretResp = http.openHttpConnectionToString(http.baseUrlHttp +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&serverchallengeresp="+bytesToHex(challengeRespEncrypted),
+                true);
+        if (!NvHTTP.getXmlString(secretResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            return PairState.FAILED;
        }
        
        // Get the server's signed secret
-        byte[] serverSecretResp = hexToBytes(NvHTTP.getXmlString(secretResp, "pairingsecret", true));
+        byte[] serverSecretResp = hexToBytes(NvHTTP.getXmlString(secretResp, "pairingsecret"));
        byte[] serverSecret = Arrays.copyOfRange(serverSecretResp, 0, 16);
        byte[] serverSignature = Arrays.copyOfRange(serverSecretResp, 16, 272);

        // Ensure the authenticity of the data
        if (!verifySignature(serverSecret, serverSignature, serverCert)) {
            // Cancel the pairing process
-            http.unpair();
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            
            // Looks like a MITM
            return PairState.FAILED;
@@ -260,7 +274,7 @@ public class PairingManager {
        byte[] serverChallengeRespHash = hashAlgo.hashData(concatBytes(concatBytes(randomChallenge, serverCert.getSignature()), serverSecret));
        if (!Arrays.equals(serverChallengeRespHash, serverResponse)) {
            // Cancel the pairing process
-            http.unpair();
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            
            // Probably got the wrong PIN
            return PairState.PIN_WRONG;
@@ -268,16 +282,19 @@ public class PairingManager {
        
        // Send the server our signed secret
        byte[] clientPairingSecret = concatBytes(clientSecret, signData(clientSecret, pk));
-        String clientSecretResp = http.executePairingCommand("clientpairingsecret="+bytesToHex(clientPairingSecret), true);
-        if (!NvHTTP.getXmlString(clientSecretResp, "paired", true).equals("1")) {
-            http.unpair();
+        String clientSecretResp = http.openHttpConnectionToString(http.baseUrlHttp + 
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&clientpairingsecret="+bytesToHex(clientPairingSecret),
+                true);
+        if (!NvHTTP.getXmlString(clientSecretResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            return PairState.FAILED;
        }
        
-        // Do the initial challenge (seems necessary for us to show as paired)
-        String pairChallenge = http.executePairingChallenge();
-        if (!NvHTTP.getXmlString(pairChallenge, "paired", true).equals("1")) {
-            http.unpair();
+        // Do the initial challenge (seems neccessary for us to show as paired)
+        String pairChallenge = http.openHttpConnectionToString(http.baseUrlHttps +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&phrase=pairchallenge", true);
+        if (!NvHTTP.getXmlString(pairChallenge, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
            return PairState.FAILED;
        }

@@ -7,5 +7,4 @@ public class KeyboardPacket {
    public static final byte MODIFIER_SHIFT = 0x01;
    public static final byte MODIFIER_CTRL = 0x02;
    public static final byte MODIFIER_ALT = 0x04;
-    public static final byte MODIFIER_META = 0x08;
-}
+}
@@ -27,16 +27,6 @@ public class MoonBridge {
    public static final int BUFFER_TYPE_PPS = 2;
    public static final int BUFFER_TYPE_VPS = 3;

-    public static final int FRAME_TYPE_PFRAME = 0;
-    public static final int FRAME_TYPE_IDR = 1;
-
-    public static final int COLORSPACE_REC_601 = 0;
-    public static final int COLORSPACE_REC_709 = 1;
-    public static final int COLORSPACE_REC_2020 = 2;
-
-    public static final int COLOR_RANGE_LIMITED = 0;
-    public static final int COLOR_RANGE_FULL = 1;
-
    public static final int CAPABILITY_DIRECT_SUBMIT = 1;
    public static final int CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC = 2;
    public static final int CAPABILITY_REFERENCE_FRAME_INVALIDATION_HEVC = 4;
@@ -52,7 +42,6 @@ public class MoonBridge {
    public static final int ML_ERROR_NO_VIDEO_FRAME = -101;
    public static final int ML_ERROR_UNEXPECTED_EARLY_TERMINATION = -102;
    public static final int ML_ERROR_PROTECTED_CONTENT = -103;
-    public static final int ML_ERROR_FRAME_CONVERSION = -104;

    public static final int ML_PORT_INDEX_TCP_47984 = 0;
    public static final int ML_PORT_INDEX_TCP_47989 = 1;
@@ -73,8 +62,6 @@ public class MoonBridge {

    public static final int ML_TEST_RESULT_INCONCLUSIVE = 0xFFFFFFFF;

-    public static final byte SS_KBE_FLAG_NON_NORMALIZED = 0x01;
-
    private static AudioRenderer audioRenderer;
    private static VideoDecoderRenderer videoRenderer;
    private static NvConnectionListener connectionListener;
@@ -166,12 +153,12 @@ public class MoonBridge {
        }
    }

-    public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                               int frameNumber, int frameType,
+    public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength,
+                                               int decodeUnitType, int frameNumber,
                                               long receiveTimeMs, long enqueueTimeMs) {
        if (videoRenderer != null) {
            return videoRenderer.submitDecodeUnit(decodeUnitData, decodeUnitLength,
-                    decodeUnitType, frameNumber, frameType, receiveTimeMs, enqueueTimeMs);
+                    decodeUnitType, frameNumber, receiveTimeMs, enqueueTimeMs);
        }
        else {
            return DR_OK;
@@ -253,12 +240,6 @@ public class MoonBridge {
        }
    }

-    public static void bridgeClSetHdrMode(boolean enabled, byte[] hdrMetadata) {
-        if (connectionListener != null) {
-            connectionListener.setHdrMode(enabled, hdrMetadata);
-        }
-    }
-
    public static void setupBridge(VideoDecoderRenderer videoRenderer, AudioRenderer audioRenderer, NvConnectionListener connectionListener) {
        MoonBridge.videoRenderer = videoRenderer;
        MoonBridge.audioRenderer = audioRenderer;
@@ -281,8 +262,7 @@ public class MoonBridge {
                                              int clientRefreshRateX100,
                                              int encryptionFlags,
                                              byte[] riAesKey, byte[] riAesIv,
-                                              int videoCapabilities,
-                                              int colorSpace, int colorRange);
+                                              int videoCapabilities);

    public static native void stopConnection();

@@ -292,8 +272,6 @@ public class MoonBridge {

    public static native void sendMousePosition(short x, short y, short referenceWidth, short referenceHeight);

-    public static native void sendMouseMoveAsMousePosition(short deltaX, short deltaY, short referenceWidth, short referenceHeight);
-
    public static native void sendMouseButton(byte buttonEvent, byte mouseButton);

    public static native void sendMultiControllerInput(short controllerNumber,
@@ -307,12 +285,12 @@ public class MoonBridge {
                                    short leftStickX, short leftStickY,
                                    short rightStickX, short rightStickY);

-    public static native void sendKeyboardInput(short keyMap, byte keyDirection, byte modifier, byte flags);
+    public static native void sendKeyboardInput(short keyMap, byte keyDirection, byte modifier);
+
+    public static native void sendMouseScroll(byte scrollClicks);

    public static native void sendMouseHighResScroll(short scrollAmount);

-    public static native void sendMouseHighResHScroll(short scrollAmount);
-
    public static native void sendUtf8Text(String text);

    public static native String getStageName(int stage);
@@ -6,14 +6,12 @@ import java.net.InetAddress;
 public class MdnsComputer {
    private InetAddress localAddr;
    private Inet6Address v6Addr;
-    private int port;
    private String name;

-    public MdnsComputer(String name, InetAddress localAddress, Inet6Address v6Addr, int port) {
+    public MdnsComputer(String name, InetAddress localAddress, Inet6Address v6Addr) {
        this.name = name;
        this.localAddr = localAddress;
        this.v6Addr = v6Addr;
-        this.port = port;
    }

    public String getName() {
@@ -28,10 +26,6 @@ public class MdnsComputer {
        return v6Addr;
    }

-    public int getPort() {
-        return port;
-    }
-
    @Override
    public int hashCode() {
        return name.hashCode();
@@ -42,7 +36,7 @@ public class MdnsComputer {
        if (o instanceof MdnsComputer) {
            MdnsComputer other = (MdnsComputer)o;

-            if (!other.name.equals(name) || other.port != port) {
+            if (!other.name.equals(name)) {
                return false;
            }

@@ -7,6 +7,7 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

@@ -24,13 +25,13 @@ public class MdnsDiscoveryAgent implements ServiceListener {
    
    private MdnsDiscoveryListener listener;
    private Thread discoveryThread;
-    private HashSet<MdnsComputer> computers = new HashSet<>();
-    private HashSet<String> pendingResolution = new HashSet<>();
+    private HashMap<InetAddress, MdnsComputer> computers = new HashMap<InetAddress, MdnsComputer>();
+    private HashSet<String> pendingResolution = new HashSet<String>();
    
    // The resolver factory's instance member has a static lifetime which
    // means our ref count and listener must be static also.
    private static int resolverRefCount = 0;
-    private static HashSet<ServiceListener> listeners = new HashSet<>();
+    private static HashSet<ServiceListener> listeners = new HashSet<ServiceListener>();
    private static ServiceListener nvstreamListener = new ServiceListener() {
        @Override
        public void serviceAdded(ServiceEvent event) {
@@ -106,7 +107,7 @@ public class MdnsDiscoveryAgent implements ServiceListener {
                return false;
            }
        }
-    }
+    };

    static {
        // Override jmDNS's default topology discovery class with ours
@@ -259,8 +260,8 @@ public class MdnsDiscoveryAgent implements ServiceListener {
        // Add a computer object for each IPv4 address reported by the PC
        for (Inet4Address v4Addr : v4Addrs) {
            synchronized (computers) {
-                MdnsComputer computer = new MdnsComputer(info.getName(), v4Addr, v6GlobalAddr, info.getPort());
-                if (computers.add(computer)) {
+                MdnsComputer computer = new MdnsComputer(info.getName(), v4Addr, v6GlobalAddr);
+                if (computers.put(computer.getLocalAddress(), computer) == null) {
                    // This was a new entry
                    listener.notifyComputerAdded(computer);
                }
@@ -272,8 +273,9 @@ public class MdnsDiscoveryAgent implements ServiceListener {
            Inet6Address v6LocalAddr = getLocalAddress(v6Addrs);

            if (v6LocalAddr != null || v6GlobalAddr != null) {
-                MdnsComputer computer = new MdnsComputer(info.getName(), v6LocalAddr, v6GlobalAddr, info.getPort());
-                if (computers.add(computer)) {
+                MdnsComputer computer = new MdnsComputer(info.getName(), v6LocalAddr, v6GlobalAddr);
+                if (computers.put(v6LocalAddr != null ?
+                        computer.getLocalAddress() : computer.getIpv6Address(), computer) == null) {
                    // This was a new entry
                    listener.notifyComputerAdded(computer);
                }
@@ -351,7 +353,7 @@ public class MdnsDiscoveryAgent implements ServiceListener {
    
    public List<MdnsComputer> getComputerSet() {
        synchronized (computers) {
-            return new ArrayList<>(computers);
+            return new ArrayList<MdnsComputer>(computers.values());
        }
    }

@@ -375,6 +377,28 @@ public class MdnsDiscoveryAgent implements ServiceListener {
    @Override
    public void serviceRemoved(ServiceEvent event) {
        LimeLog.info("mDNS: Machine disappeared: "+event.getInfo().getName());
+
+        Inet4Address v4Addrs[] = event.getInfo().getInet4Addresses();
+        for (Inet4Address addr : v4Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = computers.remove(addr);
+                if (computer != null) {
+                    listener.notifyComputerRemoved(computer);
+                    break;
+                }
+            }
+        }
+
+        Inet6Address v6Addrs[] = event.getInfo().getInet6Addresses();
+        for (Inet6Address addr : v6Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = computers.remove(addr);
+                if (computer != null) {
+                    listener.notifyComputerRemoved(computer);
+                    break;
+                }
+            }
+        }
    }

    @Override
@@ -2,5 +2,6 @@ package com.limelight.nvstream.mdns;

 public interface MdnsDiscoveryListener {
    void notifyComputerAdded(MdnsComputer computer);
+    void notifyComputerRemoved(MdnsComputer computer);
    void notifyDiscoveryFailure(Exception e);
 }
@@ -10,87 +10,38 @@ import com.limelight.LimeLog;
 import com.limelight.nvstream.http.ComputerDetails;

 public class WakeOnLanSender {
-    // These ports will always be tried as-is.
-    private static final int[] STATIC_PORTS_TO_TRY = new int[] {
+    private static final int[] PORTS_TO_TRY = new int[] {
        9, // Standard WOL port (privileged port)
+        47998, 47999, 48000, 48002, 48010, // Ports opened by GFE
        47009, // Port opened by Moonlight Internet Hosting Tool for WoL (non-privileged port)
    };
-
-    // These ports will be offset by the base port number (47989) to support alternate ports.
-    private static final int[] DYNAMIC_PORTS_TO_TRY = new int[] {
-        47998, 47999, 48000, 48002, 48010, // Ports opened by GFE
-    };
-
-    private static void sendPacketsForAddress(InetAddress address, int httpPort, DatagramSocket sock, byte[] payload) throws IOException {
-        IOException lastException = null;
-        boolean sentWolPacket = false;
-
-        // Try the static ports
-        for (int port : STATIC_PORTS_TO_TRY) {
-            try {
-                DatagramPacket dp = new DatagramPacket(payload, payload.length);
-                dp.setAddress(address);
-                dp.setPort(port);
-                sock.send(dp);
-                sentWolPacket = true;
-            } catch (IOException e) {
-                e.printStackTrace();
-                lastException = e;
-            }
-        }
-
-        // Try the dynamic ports
-        for (int port : DYNAMIC_PORTS_TO_TRY) {
-            try {
-                DatagramPacket dp = new DatagramPacket(payload, payload.length);
-                dp.setAddress(address);
-                dp.setPort((port - 47989) + httpPort);
-                sock.send(dp);
-                sentWolPacket = true;
-            } catch (IOException e) {
-                e.printStackTrace();
-                lastException = e;
-            }
-        }
-
-        if (!sentWolPacket) {
-            throw lastException;
-        }
-    }
    
    public static void sendWolPacket(ComputerDetails computer) throws IOException {
+        DatagramSocket sock = new DatagramSocket(0);
        byte[] payload = createWolPayload(computer);
        IOException lastException = null;
        boolean sentWolPacket = false;

-        try (final DatagramSocket sock = new DatagramSocket(0)) {
-            // Try all resolved remote and local addresses and broadcast addresses.
+        try {
+            // Try all resolved remote and local addresses and IPv4 broadcast address.
            // The broadcast address is required to avoid stale ARP cache entries
            // making the sleeping machine unreachable.
-            for (ComputerDetails.AddressTuple address : new ComputerDetails.AddressTuple[] {
-                    computer.localAddress, computer.remoteAddress,
-                    computer.manualAddress, computer.ipv6Address,
+            for (String unresolvedAddress : new String[] {
+                    computer.localAddress, computer.remoteAddress, computer.manualAddress, computer.ipv6Address, "255.255.255.255"
            }) {
-                if (address == null) {
+                if (unresolvedAddress == null) {
                    continue;
                }

                try {
-                    sendPacketsForAddress(InetAddress.getByName("255.255.255.255"), address.port, sock, payload);
-                    sentWolPacket = true;
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    lastException = e;
-                }
-
-                try {
-                    for (InetAddress resolvedAddress : InetAddress.getAllByName(address.address)) {
-                        try {
-                            sendPacketsForAddress(resolvedAddress, address.port, sock, payload);
+                    for (InetAddress resolvedAddress : InetAddress.getAllByName(unresolvedAddress)) {
+                        // Try all the ports for each resolved address
+                        for (int port : PORTS_TO_TRY) {
+                            DatagramPacket dp = new DatagramPacket(payload, payload.length);
+                            dp.setAddress(resolvedAddress);
+                            dp.setPort(port);
+                            sock.send(dp);
                            sentWolPacket = true;
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                            lastException = e;
                        }
                    }
                } catch (IOException e) {
@@ -101,6 +52,8 @@ public class WakeOnLanSender {
                    lastException = e;
                }
            }
+        } finally {
+            sock.close();
        }

        // Propagate the DNS resolution exception if we didn't
@@ -112,20 +65,18 @@ public class WakeOnLanSender {
    
    private static byte[] macStringToBytes(String macAddress) {
        byte[] macBytes = new byte[6];
-
-        try (@SuppressWarnings("resource")
-             final Scanner scan = new Scanner(macAddress).useDelimiter(":")
-        ) {
-            for (int i = 0; i < macBytes.length && scan.hasNext(); i++) {
-                try {
-                    macBytes[i] = (byte) Integer.parseInt(scan.next(), 16);
-                } catch (NumberFormatException e) {
-                    LimeLog.warning("Malformed MAC address: " + macAddress + " (index: " + i + ")");
-                    break;
-                }
+        @SuppressWarnings("resource")
+        Scanner scan = new Scanner(macAddress).useDelimiter(":");
+        for (int i = 0; i < macBytes.length && scan.hasNext(); i++) {
+            try {
+                macBytes[i] = (byte) Integer.parseInt(scan.next(), 16);
+            } catch (NumberFormatException e) {
+                LimeLog.warning("Malformed MAC address: "+macAddress+" (index: "+i+")");
+                break;
            }
-            return macBytes;
        }
+        scan.close();
+        return macBytes;
    }
    
    private static byte[] createWolPayload(ComputerDetails computer) {
@@ -6,8 +6,6 @@ import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -90,39 +88,16 @@ public class AddComputerManually extends Activity {

            // Couldn't find a matching interface
            return true;
-        } catch (Exception e) {
-            // Catch all exceptions because some broken Android devices
-            // will throw an NPE from inside getNetworkInterfaces().
+        } catch (SocketException e) {
            e.printStackTrace();
            return false;
+        } catch (UnknownHostException e) {
+            return false;
        }
    }

-    private URI parseRawUserInputToUri(String rawUserInput) {
-        try {
-            // Try adding a scheme and parsing the remaining input.
-            // This handles input like 127.0.0.1:47989, [::1], [::1]:47989, and 127.0.0.1.
-            URI uri = new URI("moonlight://" + rawUserInput);
-            if (uri.getHost() != null && !uri.getHost().isEmpty()) {
-                return uri;
-            }
-        } catch (URISyntaxException ignored) {}
-
-        try {
-            // Attempt to escape the input as an IPv6 literal.
-            // This handles input like ::1.
-            URI uri = new URI("moonlight://[" + rawUserInput + "]");
-            if (uri.getHost() != null && !uri.getHost().isEmpty()) {
-                return uri;
-            }
-        } catch (URISyntaxException ignored) {}
-
-        return null;
-    }
-
-    private void doAddPc(String rawUserInput) throws InterruptedException {
+    private void doAddPc(String host) {
        boolean wrongSiteLocal = false;
-        boolean invalidInput = false;
        boolean success;
        int portTestResult;

@@ -131,42 +106,18 @@ public class AddComputerManually extends Activity {

        try {
            ComputerDetails details = new ComputerDetails();
-
-            // Check if we parsed a host address successfully
-            URI uri = parseRawUserInputToUri(rawUserInput);
-            if (uri != null && uri.getHost() != null && !uri.getHost().isEmpty()) {
-                String host = uri.getHost();
-                int port = uri.getPort();
-
-                // If a port was not specified, use the default
-                if (port == -1) {
-                    port = NvHTTP.DEFAULT_HTTP_PORT;
-                }
-
-                details.manualAddress = new ComputerDetails.AddressTuple(host, port);
-                success = managerBinder.addComputerBlocking(details);
-                if (!success){
-                    wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
-                }
-            } else {
-                // Invalid user input
-                success = false;
-                invalidInput = true;
-            }
-        } catch (InterruptedException e) {
-            // Propagate the InterruptedException to the caller for proper handling
-            dialog.dismiss();
-            throw e;
+            details.manualAddress = host;
+            success = managerBinder.addComputerBlocking(details);
        } catch (IllegalArgumentException e) {
            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
            e.printStackTrace();
            success = false;
-            invalidInput = true;
        }
-
-        // Keep the SpinnerDialog open while testing connectivity
-        if (!success && !wrongSiteLocal && !invalidInput) {
+        if (!success){
+            wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
+        }
+        if (!success && !wrongSiteLocal) {
            // Run the test before dismissing the spinner because it can take a few seconds.
            portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER, 443,
                    MoonBridge.ML_PORT_FLAG_TCP_47984 | MoonBridge.ML_PORT_FLAG_TCP_47989);
@@ -177,10 +128,7 @@ public class AddComputerManually extends Activity {

        dialog.dismiss();

-        if (invalidInput) {
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), getResources().getString(R.string.addpc_unknown_host), false);
-        }
-        else if (wrongSiteLocal) {
+        if (wrongSiteLocal) {
            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), getResources().getString(R.string.addpc_wrong_sitelocal), false);
        }
        else if (!success) {
@@ -214,12 +162,15 @@ public class AddComputerManually extends Activity {
            @Override
            public void run() {
                while (!isInterrupted()) {
+                    String computer;
+
                    try {
-                        String computer = computersToAdd.take();
-                        doAddPc(computer);
+                        computer = computersToAdd.take();
                    } catch (InterruptedException e) {
                        return;
                    }
+
+                    doAddPc(computer);
                }
            }
        };
@@ -233,14 +184,7 @@ public class AddComputerManually extends Activity {

            try {
                addThread.join();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-
-                // InterruptedException clears the thread's interrupt status. Since we can't
-                // handle that here, we will re-interrupt the thread to set the interrupt
-                // status back to true.
-                Thread.currentThread().interrupt();
-            }
+            } catch (InterruptedException ignored) {}

            addThread = null;
        }
@@ -1,51 +0,0 @@
-package com.limelight.preferences;
-
-import android.annotation.TargetApi;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.preference.ListPreference;
-import android.provider.Settings;
-import android.util.AttributeSet;
-
-public class LanguagePreference extends ListPreference {
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public LanguagePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public LanguagePreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public LanguagePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public LanguagePreference(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void onClick() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            try {
-                // Launch the Android native app locale settings page
-                Intent intent = new Intent(Settings.ACTION_APP_LOCALE_SETTINGS);
-                intent.addCategory(Intent.CATEGORY_DEFAULT);
-                intent.setData(Uri.parse("package:" + getContext().getPackageName()));
-                getContext().startActivity(intent, null);
-                return;
-            } catch (ActivityNotFoundException e) {
-                // App locale settings should be present on all Android 13 devices,
-                // but if not, we'll launch the old language chooser.
-            }
-        }
-
-        // If we don't have native app locale settings, launch the normal dialog
-        super.onClick();
-    }
-}
@@ -5,7 +5,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import android.view.Display;

 import com.limelight.nvstream.jni.MoonBridge;

@@ -31,7 +30,7 @@ public class PreferenceConfiguration {
    private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
    private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
    private static final String ONLY_L3_R3_PREF_STRING = "checkbox_only_show_L3R3";
-    private static final String LEGACY_DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
+    private static final String DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
    private static final String ENABLE_HDR_PREF_STRING = "checkbox_enable_hdr";
    private static final String ENABLE_PIP_PREF_STRING = "checkbox_enable_pip";
    private static final String ENABLE_PERF_OVERLAY_STRING = "checkbox_enable_perf_overlay";
@@ -44,11 +43,6 @@ public class PreferenceConfiguration {
    private static final String FLIP_FACE_BUTTONS_PREF_STRING = "checkbox_flip_face_buttons";
    private static final String TOUCHSCREEN_TRACKPAD_PREF_STRING = "checkbox_touchscreen_trackpad";
    private static final String LATENCY_TOAST_PREF_STRING = "checkbox_enable_post_stream_toast";
-    private static final String FRAME_PACING_PREF_STRING = "frame_pacing";
-    private static final String ABSOLUTE_MOUSE_MODE_PREF_STRING = "checkbox_absolute_mouse_mode";
-    private static final String ENABLE_AUDIO_FX_PREF_STRING = "checkbox_enable_audiofx";
-    private static final String REDUCE_REFRESH_RATE_PREF_STRING = "checkbox_reduce_refresh_rate";
-    private static final String FULL_RANGE_PREF_STRING = "checkbox_full_range";

    static final String DEFAULT_RESOLUTION = "1280x720";
    static final String DEFAULT_FPS = "60";
@@ -56,7 +50,7 @@ public class PreferenceConfiguration {
    private static final boolean DEFAULT_SOPS = true;
    private static final boolean DEFAULT_DISABLE_TOASTS = false;
    private static final boolean DEFAULT_HOST_AUDIO = false;
-    private static final int DEFAULT_DEADZONE = 7;
+    private static final int DEFAULT_DEADZONE = 15;
    private static final int DEFAULT_OPACITY = 90;
    public static final String DEFAULT_LANGUAGE = "default";
    private static final boolean DEFAULT_MULTI_CONTROLLER = true;
@@ -64,6 +58,7 @@ public class PreferenceConfiguration {
    private static final String DEFAULT_VIDEO_FORMAT = "auto";
    private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
    private static final boolean ONLY_L3_R3_DEFAULT = false;
+    private static final boolean DEFAULT_DISABLE_FRAME_DROP = false;
    private static final boolean DEFAULT_ENABLE_HDR = false;
    private static final boolean DEFAULT_ENABLE_PIP = false;
    private static final boolean DEFAULT_ENABLE_PERF_OVERLAY = false;
@@ -77,21 +72,11 @@ public class PreferenceConfiguration {
    private static final boolean DEFAULT_TOUCHSCREEN_TRACKPAD = true;
    private static final String DEFAULT_AUDIO_CONFIG = "2"; // Stereo
    private static final boolean DEFAULT_LATENCY_TOAST = false;
-    private static final String DEFAULT_FRAME_PACING = "latency";
-    private static final boolean DEFAULT_ABSOLUTE_MOUSE_MODE = false;
-    private static final boolean DEFAULT_ENABLE_AUDIO_FX = false;
-    private static final boolean DEFAULT_REDUCE_REFRESH_RATE = false;
-    private static final boolean DEFAULT_FULL_RANGE = false;

    public static final int FORCE_H265_ON = -1;
    public static final int AUTOSELECT_H265 = 0;
    public static final int FORCE_H265_OFF = 1;

-    public static final int FRAME_PACING_MIN_LATENCY = 0;
-    public static final int FRAME_PACING_BALANCED = 1;
-    public static final int FRAME_PACING_CAP_FPS = 2;
-    public static final int FRAME_PACING_MAX_SMOOTHNESS = 3;
-
    public static final String RES_360P = "640x360";
    public static final String RES_480P = "854x480";
    public static final String RES_720P = "1280x720";
@@ -110,6 +95,7 @@ public class PreferenceConfiguration {
    public boolean smallIconMode, multiController, usbDriver, flipFaceButtons;
    public boolean onscreenController;
    public boolean onlyL3R3;
+    public boolean disableFrameDrop;
    public boolean enableHdr;
    public boolean enablePip;
    public boolean enablePerfOverlay;
@@ -122,11 +108,6 @@ public class PreferenceConfiguration {
    public boolean vibrateFallbackToDevice;
    public boolean touchscreenTrackpad;
    public MoonBridge.AudioConfiguration audioConfiguration;
-    public int framePacing;
-    public boolean absoluteMouseMode;
-    public boolean enableAudioFx;
-    public boolean reduceRefreshRate;
-    public boolean fullRange;

    public static boolean isNativeResolution(int width, int height) {
        // It's not a native resolution if it matches an existing resolution option
@@ -152,31 +133,6 @@ public class PreferenceConfiguration {
        return true;
    }

-    // If we have a screen that has semi-square dimensions, we may want to change our behavior
-    // to allow any orientation and vertical+horizontal resolutions.
-    public static boolean isSquarishScreen(int width, int height) {
-        float longDim = Math.max(width, height);
-        float shortDim = Math.min(width, height);
-
-        // We just put the arbitrary cutoff for a square-ish screen at 1.3
-        return longDim / shortDim < 1.3f;
-    }
-
-    public static boolean isSquarishScreen(Display display) {
-        int width, height;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            width = display.getMode().getPhysicalWidth();
-            height = display.getMode().getPhysicalHeight();
-        }
-        else {
-            width = display.getWidth();
-            height = display.getHeight();
-        }
-
-        return isSquarishScreen(width, height);
-    }
-
    private static String convertFromLegacyResolutionString(String resString) {
        if (resString.equalsIgnoreCase("360p")) {
            return RES_360P;
@@ -308,37 +264,6 @@ public class PreferenceConfiguration {
        }
    }

-    private static int getFramePacingValue(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        // Migrate legacy never drop frames option to the new location
-        if (prefs.contains(LEGACY_DISABLE_FRAME_DROP_PREF_STRING)) {
-            boolean legacyNeverDropFrames = prefs.getBoolean(LEGACY_DISABLE_FRAME_DROP_PREF_STRING, false);
-            prefs.edit()
-                    .remove(LEGACY_DISABLE_FRAME_DROP_PREF_STRING)
-                    .putString(FRAME_PACING_PREF_STRING, legacyNeverDropFrames ? "balanced" : "latency")
-                    .apply();
-        }
-
-        String str = prefs.getString(FRAME_PACING_PREF_STRING, DEFAULT_FRAME_PACING);
-        if (str.equals("latency")) {
-            return FRAME_PACING_MIN_LATENCY;
-        }
-        else if (str.equals("balanced")) {
-            return FRAME_PACING_BALANCED;
-        }
-        else if (str.equals("cap-fps")) {
-            return FRAME_PACING_CAP_FPS;
-        }
-        else if (str.equals("smoothness")) {
-            return FRAME_PACING_MAX_SMOOTHNESS;
-        }
-        else {
-            // Should never get here
-            return FRAME_PACING_MIN_LATENCY;
-        }
-    }
-
    public static void resetStreamingSettings(Context context) {
        // We consider resolution, FPS, bitrate, HDR, and video format as "streaming settings" here
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -351,23 +276,9 @@ public class PreferenceConfiguration {
                .remove(VIDEO_FORMAT_PREF_STRING)
                .remove(ENABLE_HDR_PREF_STRING)
                .remove(UNLOCK_FPS_STRING)
-                .remove(FULL_RANGE_PREF_STRING)
                .apply();
    }

-    public static void completeLanguagePreferenceMigration(Context context) {
-        // Put our language option back to default which tells us that we've already migrated it
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putString(LANGUAGE_PREF_STRING, DEFAULT_LANGUAGE).apply();
-    }
-
-    public static boolean isShieldAtvFirmwareWithBrokenHdr() {
-        // This particular Shield TV firmware crashes when using HDR
-        // https://www.nvidia.com/en-us/geforce/forums/notifications/comment/155192/
-        return Build.MANUFACTURER.equalsIgnoreCase("NVIDIA") &&
-                Build.FINGERPRINT.contains("PPR1.180610.011/4079208_2235.1395");
-    }
-
    public static PreferenceConfiguration readPreferences(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
        PreferenceConfiguration config = new PreferenceConfiguration();
@@ -476,7 +387,6 @@ public class PreferenceConfiguration {
        }

        config.videoFormat = getVideoFormatValue(context);
-        config.framePacing = getFramePacingValue(context);

        config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);

@@ -494,7 +404,8 @@ public class PreferenceConfiguration {
        config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
        config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
        config.onlyL3R3 = prefs.getBoolean(ONLY_L3_R3_PREF_STRING, ONLY_L3_R3_DEFAULT);
-        config.enableHdr = prefs.getBoolean(ENABLE_HDR_PREF_STRING, DEFAULT_ENABLE_HDR) && !isShieldAtvFirmwareWithBrokenHdr();
+        config.disableFrameDrop = prefs.getBoolean(DISABLE_FRAME_DROP_PREF_STRING, DEFAULT_DISABLE_FRAME_DROP);
+        config.enableHdr = prefs.getBoolean(ENABLE_HDR_PREF_STRING, DEFAULT_ENABLE_HDR);
        config.enablePip = prefs.getBoolean(ENABLE_PIP_PREF_STRING, DEFAULT_ENABLE_PIP);
        config.enablePerfOverlay = prefs.getBoolean(ENABLE_PERF_OVERLAY_STRING, DEFAULT_ENABLE_PERF_OVERLAY);
        config.bindAllUsb = prefs.getBoolean(BIND_ALL_USB_STRING, DEFAULT_BIND_ALL_USB);
@@ -506,10 +417,6 @@ public class PreferenceConfiguration {
        config.flipFaceButtons = prefs.getBoolean(FLIP_FACE_BUTTONS_PREF_STRING, DEFAULT_FLIP_FACE_BUTTONS);
        config.touchscreenTrackpad = prefs.getBoolean(TOUCHSCREEN_TRACKPAD_PREF_STRING, DEFAULT_TOUCHSCREEN_TRACKPAD);
        config.enableLatencyToast = prefs.getBoolean(LATENCY_TOAST_PREF_STRING, DEFAULT_LATENCY_TOAST);
-        config.absoluteMouseMode = prefs.getBoolean(ABSOLUTE_MOUSE_MODE_PREF_STRING, DEFAULT_ABSOLUTE_MOUSE_MODE);
-        config.enableAudioFx = prefs.getBoolean(ENABLE_AUDIO_FX_PREF_STRING, DEFAULT_ENABLE_AUDIO_FX);
-        config.reduceRefreshRate = prefs.getBoolean(REDUCE_REFRESH_RATE_PREF_STRING, DEFAULT_REDUCE_REFRESH_RATE);
-        config.fullRange = prefs.getBoolean(FULL_RANGE_PREF_STRING, DEFAULT_FULL_RANGE);

        return config;
    }
@@ -4,14 +4,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.media.MediaCodecInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.app.Activity;
 import android.os.Handler;
 import android.os.Vibrator;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -39,19 +37,14 @@ import java.util.Arrays;

 public class StreamSettings extends Activity {
    private PreferenceConfiguration previousPrefs;
-    private int previousDisplayPixelCount;

    // HACK for Android 9
    static DisplayCutout displayCutoutP;

    void reloadSettings() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Display.Mode mode = getWindowManager().getDefaultDisplay().getMode();
-            previousDisplayPixelCount = mode.getPhysicalWidth() * mode.getPhysicalHeight();
-        }
        getFragmentManager().beginTransaction().replace(
                R.id.stream_settings, new SettingsFragment()
-        ).commitAllowingStateLoss();
+        ).commit();
    }

    @Override
@@ -86,38 +79,16 @@ public class StreamSettings extends Activity {
    }

    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Display.Mode mode = getWindowManager().getDefaultDisplay().getMode();
-
-            // If the display's physical pixel count has changed, we consider that it's a new display
-            // and we should reload our settings (which include display-dependent values).
-            //
-            // NB: We aren't using displayId here because that stays the same (DEFAULT_DISPLAY) when
-            // switching between screens on a foldable device.
-            if (mode.getPhysicalWidth() * mode.getPhysicalHeight() != previousDisplayPixelCount) {
-                reloadSettings();
-            }
-        }
-    }
-
-    @Override
-    // NOTE: This will NOT be called on Android 13+ with android:enableOnBackInvokedCallback="true"
    public void onBackPressed() {
        finish();

-        // Language changes are handled via configuration changes in Android 13+,
-        // so manual activity relaunching is no longer required.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            PreferenceConfiguration newPrefs = PreferenceConfiguration.readPreferences(this);
-            if (!newPrefs.language.equals(previousPrefs.language)) {
-                // Restart the PC view to apply UI changes
-                Intent intent = new Intent(this, PcView.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent, null);
-            }
+        // Check for changes that require a UI reload to take effect
+        PreferenceConfiguration newPrefs = PreferenceConfiguration.readPreferences(this);
+        if (!newPrefs.language.equals(previousPrefs.language)) {
+            // Restart the PC view to apply UI changes
+            Intent intent = new Intent(this, PcView.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent, null);
        }
    }

@@ -130,7 +101,7 @@ public class StreamSettings extends Activity {
            pref.setValue(value);
        }

-        private void addNativeResolutionEntry(int nativeWidth, int nativeHeight, boolean insetsRemoved, boolean portrait) {
+        private void addNativeResolutionEntry(int nativeWidth, int nativeHeight, boolean insetsRemoved) {
            ListPreference pref = (ListPreference) findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING);

            String newName;
@@ -142,15 +113,6 @@ public class StreamSettings extends Activity {
                newName = getResources().getString(R.string.resolution_prefix_native);
            }

-            if (PreferenceConfiguration.isSquarishScreen(nativeWidth, nativeHeight)) {
-                if (portrait) {
-                    newName += " " + getResources().getString(R.string.resolution_prefix_native_portrait);
-                }
-                else {
-                    newName += " " + getResources().getString(R.string.resolution_prefix_native_landscape);
-                }
-            }
-
            newName += " ("+nativeWidth+"x"+nativeHeight+")";

            String newValue = nativeWidth+"x"+nativeHeight;
@@ -180,13 +142,6 @@ public class StreamSettings extends Activity {
            }
        }

-        private void addNativeResolutionEntries(int nativeWidth, int nativeHeight, boolean insetsRemoved) {
-            if (PreferenceConfiguration.isSquarishScreen(nativeWidth, nativeHeight)) {
-                addNativeResolutionEntry(nativeHeight, nativeWidth, insetsRemoved, true);
-            }
-            addNativeResolutionEntry(nativeWidth, nativeHeight, insetsRemoved, false);
-        }
-
        private void removeValue(String preferenceKey, String value, Runnable onMatched) {
            int matchingCount = 0;

@@ -252,19 +207,19 @@ public class StreamSettings extends Activity {
            PreferenceScreen screen = getPreferenceScreen();

            // hide on-screen controls category on non touch screen devices
-            if (!getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)) {
-                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_onscreen_controls");
-                screen.removePreference(category);
-            }
+            if (!getActivity().getPackageManager().
+                    hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)) {
+                {
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_onscreen_controls");
+                    screen.removePreference(category);
+                }

-            // Hide remote desktop mouse mode on pre-Oreo (which doesn't have pointer capture)
-            // and NVIDIA SHIELD devices (which support raw mouse input in pointer capture mode)
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O ||
-                    getActivity().getPackageManager().hasSystemFeature("com.nvidia.feature.shield")) {
-                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_input_settings");
-                category.removePreference(findPreference("checkbox_absolute_mouse_mode"));
+                {
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_input_settings");
+                    category.removePreference(findPreference("checkbox_touchscreen_trackpad"));
+                }
            }

            // Remove PiP mode on devices pre-Oreo, where the feature is not available (some low RAM devices),
@@ -277,13 +232,6 @@ public class StreamSettings extends Activity {
                category.removePreference(findPreference("checkbox_enable_pip"));
            }

-            // Fire TV apps are not allowed to use WebViews or browsers, so hide the Help category
-            /*if (getActivity().getPackageManager().hasSystemFeature("amazon.hardware.fire_tv")) {
-                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_help");
-                screen.removePreference(category);
-            }*/
-
            // Remove the vibration options if the device can't vibrate
            if (!((Vibrator)getActivity().getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
                PreferenceCategory category =
@@ -331,7 +279,7 @@ public class StreamSettings extends Activity {
                            int width = Math.max(metrics.widthPixels - widthInsets, metrics.heightPixels - heightInsets);
                            int height = Math.min(metrics.widthPixels - widthInsets, metrics.heightPixels - heightInsets);

-                            addNativeResolutionEntries(width, height, false);
+                            addNativeResolutionEntry(width, height, false);
                            hasInsets = true;
                        }
                    }
@@ -356,7 +304,7 @@ public class StreamSettings extends Activity {
                    // unless they report greater than 4K resolutions.
                    if (!getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION) ||
                            (width > 3840 || height > 2160)) {
-                        addNativeResolutionEntries(width, height, hasInsets);
+                        addNativeResolutionEntry(width, height, hasInsets);
                    }

                    if ((width >= 3840 || height >= 2160) && maxSupportedResW < 3840) {
@@ -466,7 +414,7 @@ public class StreamSettings extends Activity {
                getActivity().getWindowManager().getDefaultDisplay().getRealMetrics(metrics);
                int width = Math.max(metrics.widthPixels, metrics.heightPixels);
                int height = Math.min(metrics.widthPixels, metrics.heightPixels);
-                addNativeResolutionEntries(width, height, false);
+                addNativeResolutionEntry(width, height, false);
            }
            else {
                // On Android 4.1, we have to resort to reflection to invoke hidden APIs
@@ -477,7 +425,7 @@ public class StreamSettings extends Activity {
                    Method getRawWidthFunc = Display.class.getMethod("getRawWidth");
                    int width = (Integer) getRawWidthFunc.invoke(display);
                    int height = (Integer) getRawHeightFunc.invoke(display);
-                    addNativeResolutionEntries(Math.max(width, height), Math.min(width, height), false);
+                    addNativeResolutionEntry(Math.max(width, height), Math.min(width, height), false);
                } catch (Exception e) {
                    e.printStackTrace();
                }
@@ -581,15 +529,6 @@ public class StreamSettings extends Activity {
                            (PreferenceCategory) findPreference("category_advanced_settings");
                    category.removePreference(findPreference("checkbox_enable_hdr"));
                }
-                else if (PreferenceConfiguration.isShieldAtvFirmwareWithBrokenHdr()) {
-                    LimeLog.info("Disabling HDR toggle on old broken SHIELD TV firmware");
-                    PreferenceCategory category =
-                            (PreferenceCategory) findPreference("category_advanced_settings");
-                    CheckBoxPreference hdrPref = (CheckBoxPreference) category.findPreference("checkbox_enable_hdr");
-                    hdrPref.setEnabled(false);
-                    hdrPref.setChecked(false);
-                    hdrPref.setSummary("Update the firmware on your NVIDIA SHIELD Android TV to enable HDR");
-                }
            }

            // Add a listener to the FPS and resolution preference
@@ -1,45 +0,0 @@
-package com.limelight.preferences;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.preference.Preference;
-import android.util.AttributeSet;
-
-import com.limelight.utils.HelpLauncher;
-
-public class WebLauncherPreference extends Preference {
-    private String url;
-
-    public WebLauncherPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initialize(attrs);
-    }
-
-    public WebLauncherPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize(attrs);
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public WebLauncherPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        initialize(attrs);
-    }
-
-    private void initialize(AttributeSet attrs) {
-        if (attrs == null) {
-            throw new IllegalStateException("WebLauncherPreference must have attributes!");
-        }
-
-        url = attrs.getAttributeValue(null, "url");
-        if (url == null) {
-            throw new IllegalStateException("WebLauncherPreference must have 'url' attribute!");
-        }
-    }
-
-    @Override
-    public void onClick() {
-        HelpLauncher.launchUrl(getContext(), url);
-    }
-}
@@ -1,5 +1,5 @@
 package com.limelight.ui;

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

-import android.annotation.TargetApi;
 import android.content.Context;
+import android.text.InputType;
 import android.util.AttributeSet;
+import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.SurfaceView;
+import android.view.View;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;

 public class StreamView extends SurfaceView {
    private double desiredAspectRatio;
@@ -20,19 +25,18 @@ public class StreamView extends SurfaceView {

    public StreamView(Context context) {
        super(context);
+
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        requestFocus();
    }

    public StreamView(Context context, AttributeSet attrs) {
        super(context, attrs);
-    }

-    public StreamView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @TargetApi(21)
-    public StreamView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
+        setFocusableInTouchMode(true);
+        setFocusable(true);
+        requestFocus();
    }

    @Override
@@ -79,8 +83,62 @@ public class StreamView extends SurfaceView {
        return super.onKeyPreIme(keyCode, event);
    }

+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
+
+        // TYPE_TEXT_VARIATION_VISIBLE_PASSWORD disables a bunch of the fancy IME
+        // stuff that we don't support (suggestions, auto-correct, GIFs, etc).
+        outAttrs.inputType |= InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+
+        // Don't show suggestions in the IME. We want everything to go through
+        // commitText() rather than setComposingText().
+        outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+
+        // Don't take up the whole screen in landscape mode, since the user
+        // needs to see at least some of the PC's screen.
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
+
+        return new StreamViewInputConnection(this, true);
+    }
+
+    class StreamViewInputConnection extends BaseInputConnection {
+        private final KeyCharacterMap kcm;
+
+        private StreamViewInputConnection(View targetView, boolean fullEditor) {
+            super(targetView, fullEditor);
+            kcm = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
+        }
+
+        @Override
+        public boolean commitText(CharSequence text, int newCursorPosition) {
+            if (inputCallbacks != null) {
+                // If all characters have a direct KeyEvent mapping, we'll send this
+                // text as normal key up/down events.
+                KeyEvent[] keyEvents = kcm.getEvents(text.toString().toCharArray());
+                if (keyEvents != null) {
+                    for (KeyEvent event : keyEvents) {
+                        sendKeyEvent(event);
+                    }
+                }
+                else {
+                    // Otherwise we'll send it as UTF-8 text
+                    inputCallbacks.handleTextEvent(text.toString());
+                }
+            }
+
+            return super.commitText(text, newCursorPosition);
+        }
+    }
+
    public interface InputCallbacks {
        boolean handleKeyUp(KeyEvent event);
        boolean handleKeyDown(KeyEvent event);
+        void handleTextEvent(String text);
    }
 }
@@ -8,7 +8,7 @@ import android.net.Uri;
 import com.limelight.HelpActivity;

 public class HelpLauncher {
-    public static void launchUrl(Context context, String url) {
+    private static void launchUrl(Context context, String url) {
        // Try to launch the default browser
        try {
            Intent i = new Intent(Intent.ACTION_VIEW);
@@ -44,8 +44,4 @@ public class HelpLauncher {
    public static void launchTroubleshooting(Context context) {
        launchUrl(context, "https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting");
    }
-
-    public static void launchGameStreamEolFaq(Context context) {
-        launchUrl(context, "https://github.com/moonlight-stream/moonlight-docs/wiki/NVIDIA-GameStream-End-Of-Service-Announcement-FAQ");
-    }
 }
@@ -6,12 +6,13 @@ import android.widget.Toast;

 import com.limelight.AppView;
 import com.limelight.Game;
+import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.ShortcutTrampoline;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.HostHttpResponseException;
+import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.nvstream.jni.MoonBridge;
@@ -26,10 +27,7 @@ import java.security.cert.CertificateEncodingException;
 public class ServerHelper {
    public static final String CONNECTION_TEST_SERVER = "android.conntest.moonlight-stream.org";

-    public static ComputerDetails.AddressTuple getCurrentAddressFromComputer(ComputerDetails computer) throws IOException {
-        if (computer.activeAddress == null) {
-            throw new IOException("No active address for "+computer.name);
-        }
+    public static String getCurrentAddressFromComputer(ComputerDetails computer) {
        return computer.activeAddress;
    }

@@ -55,9 +53,7 @@ public class ServerHelper {
    public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer,
                                           ComputerManagerService.ComputerManagerBinder managerBinder) {
        Intent intent = new Intent(parent, Game.class);
-        intent.putExtra(Game.EXTRA_HOST, computer.activeAddress.address);
-        intent.putExtra(Game.EXTRA_PORT, computer.activeAddress.port);
-        intent.putExtra(Game.EXTRA_HTTPS_PORT, computer.httpsPort);
+        intent.putExtra(Game.EXTRA_HOST, getCurrentAddressFromComputer(computer));
        intent.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
        intent.putExtra(Game.EXTRA_APP_ID, app.getAppId());
        intent.putExtra(Game.EXTRA_APP_HDR, app.isHdrSupported());
@@ -76,7 +72,8 @@ public class ServerHelper {

    public static void doStart(Activity parent, NvApp app, ComputerDetails computer,
                               ComputerManagerService.ComputerManagerBinder managerBinder) {
-        if (computer.state == ComputerDetails.State.OFFLINE || computer.activeAddress == null) {
+        if (computer.state == ComputerDetails.State.OFFLINE ||
+                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
            Toast.makeText(parent, parent.getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
            return;
        }
@@ -127,14 +124,14 @@ public class ServerHelper {
                NvHTTP httpConn;
                String message;
                try {
-                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), computer.httpsPort,
+                    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 {
                        message = parent.getResources().getString(R.string.applist_quit_fail) + " " + app.getAppName();
                    }
-                } catch (HostHttpResponseException e) {
+                } catch (GfeHttpResponseException e) {
                    if (e.getErrorCode() == 599) {
                        message = "This session wasn't started by this device," +
                                " so it cannot be quit. End streaming on the original " +
@@ -2,9 +2,6 @@ package com.limelight.utils;

 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.GameManager;
-import android.app.GameState;
-import android.app.LocaleManager;
 import android.app.UiModeManager;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -12,12 +9,10 @@ import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Insets;
 import android.os.Build;
-import android.os.LocaleList;
 import android.view.View;
 import android.view.WindowInsets;
 import android.view.WindowManager;

-import com.limelight.Game;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.preferences.PreferenceConfiguration;
@@ -29,66 +24,25 @@ public class UiHelper {
    private static final int TV_VERTICAL_PADDING_DP = 15;
    private static final int TV_HORIZONTAL_PADDING_DP = 15;

-    private static void setGameModeStatus(Context context, boolean streaming, boolean loading, boolean interruptible) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            GameManager gameManager = context.getSystemService(GameManager.class);
-
-            if (streaming) {
-                gameManager.setGameState(new GameState(loading, interruptible ? GameState.MODE_GAMEPLAY_INTERRUPTIBLE : GameState.MODE_GAMEPLAY_UNINTERRUPTIBLE));
-            }
-            else {
-                gameManager.setGameState(new GameState(loading, GameState.MODE_NONE));
-            }
-        }
-    }
-
-    public static void notifyStreamConnecting(Context context) {
-        setGameModeStatus(context, true, true, true);
-    }
-
-    public static void notifyStreamConnected(Context context) {
-        setGameModeStatus(context, true, false, false);
-    }
-
-    public static void notifyStreamEnteringPiP(Context context) {
-        setGameModeStatus(context, true, false, true);
-    }
-
-    public static void notifyStreamExitingPiP(Context context) {
-        setGameModeStatus(context, true, false, false);
-    }
-
-    public static void notifyStreamEnded(Context context) {
-        setGameModeStatus(context, false, false, false);
-    }
-
    public static void setLocale(Activity activity)
    {
        String locale = PreferenceConfiguration.readPreferences(activity).language;
        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                // On Android 13, migrate this non-default language setting into the OS native API
-                LocaleManager localeManager = activity.getSystemService(LocaleManager.class);
-                localeManager.setApplicationLocales(LocaleList.forLanguageTags(locale));
-                PreferenceConfiguration.completeLanguagePreferenceMigration(activity);
-            }
-            else {
-                Configuration config = new Configuration(activity.getResources().getConfiguration());
+            Configuration config = new Configuration(activity.getResources().getConfiguration());

-                // Some locales include both language and country which must be separated
-                // before calling the Locale constructor.
-                if (locale.contains("-"))
-                {
-                    config.locale = new Locale(locale.substring(0, locale.indexOf('-')),
-                            locale.substring(locale.indexOf('-') + 1));
-                }
-                else
-                {
-                    config.locale = new Locale(locale);
-                }
-
-                activity.getResources().updateConfiguration(config, activity.getResources().getDisplayMetrics());
+            // Some locales include both language and country which must be separated
+            // before calling the Locale constructor.
+            if (locale.contains("-"))
+            {
+                config.locale = new Locale(locale.substring(0, locale.indexOf('-')),
+                        locale.substring(locale.indexOf('-') + 1));
            }
+            else
+            {
+                config.locale = new Locale(locale);
+            }
+
+            activity.getResources().updateConfiguration(config, activity.getResources().getDisplayMetrics());
        }
    }

@@ -114,9 +68,6 @@ public class UiHelper {
        View rootView = activity.findViewById(android.R.id.content);
        UiModeManager modeMgr = (UiModeManager) activity.getSystemService(Context.UI_MODE_SERVICE);

-        // Set GameState.MODE_NONE initially for all activities
-        setGameModeStatus(activity, false, false, false);
-
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            // Allow this non-streaming activity to layout under notches.
            //
@@ -1,4 +1,4 @@
-PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
 OUTPUT_DIR=~/openssl

 BASE_ARGS="no-shared no-ssl3 no-stdio no-engine no-hw"
@@ -32,7 +32,6 @@ static jmethodID BridgeClConnectionStartedMethod;
 static jmethodID BridgeClConnectionTerminatedMethod;
 static jmethodID BridgeClRumbleMethod;
 static jmethodID BridgeClConnectionStatusUpdateMethod;
-static jmethodID BridgeClSetHdrModeMethod;
 static jbyteArray DecodedFrameBuffer;
 static jshortArray DecodedAudioBuffer;

@@ -80,7 +79,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
    BridgeDrStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStart", "()V");
    BridgeDrStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStop", "()V");
    BridgeDrCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrCleanup", "()V");
-    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIIJJ)I");
+    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIJJ)I");
    BridgeArInitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArInit", "(III)I");
    BridgeArStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStart", "()V");
    BridgeArStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStop", "()V");
@@ -93,7 +92,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
    BridgeClConnectionTerminatedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionTerminated", "(I)V");
    BridgeClRumbleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClRumble", "(SSS)V");
    BridgeClConnectionStatusUpdateMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStatusUpdate", "(I)V");
-    BridgeClSetHdrModeMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClSetHdrMode", "(Z[B)V");
 }

 int BridgeDrSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
@@ -159,8 +157,8 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {

            ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                              DecodedFrameBuffer, currentEntry->length, currentEntry->bufferType,
-                                              decodeUnit->frameNumber, decodeUnit->frameType,
-                                              (jlong)decodeUnit->receiveTimeMs, (jlong)decodeUnit->enqueueTimeMs);
+                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs,
+                                              (jlong)decodeUnit->enqueueTimeMs);
            if ((*env)->ExceptionCheck(env)) {
                // We will crash here
                (*JVM)->DetachCurrentThread(JVM);
@@ -180,7 +178,7 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {

    ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                       DecodedFrameBuffer, offset, BUFFER_TYPE_PICDATA,
-                                       decodeUnit->frameNumber, decodeUnit->frameType,
+                                       decodeUnit->frameNumber,
                                       (jlong)decodeUnit->receiveTimeMs, (jlong)decodeUnit->enqueueTimeMs);
    if ((*env)->ExceptionCheck(env)) {
        // We will crash here
@@ -328,25 +326,6 @@ void BridgeClConnectionStatusUpdate(int connectionStatus) {
    }
 }

-void BridgeClSetHdrMode(bool enabled) {
-    JNIEnv* env = GetThreadEnv();
-
-    jbyteArray hdrMetadataByteArray = NULL;
-    SS_HDR_METADATA hdrMetadata;
-
-    // Check if HDR metadata was provided
-    if (enabled && LiGetHdrMetadata(&hdrMetadata)) {
-        hdrMetadataByteArray = (*env)->NewByteArray(env, sizeof(SS_HDR_METADATA));
-        (*env)->SetByteArrayRegion(env, hdrMetadataByteArray, 0, sizeof(SS_HDR_METADATA), (jbyte*)&hdrMetadata);
-    }
-
-    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClSetHdrModeMethod, enabled, hdrMetadataByteArray);
-    if ((*env)->ExceptionCheck(env)) {
-        // We will crash here
-        (*JVM)->DetachCurrentThread(JVM);
-    }
-}
-
 void BridgeClLogMessage(const char* format, ...) {
    va_list va;
    va_start(va, format);
@@ -380,7 +359,6 @@ static CONNECTION_LISTENER_CALLBACKS BridgeConnListenerCallbacks = {
        .logMessage = BridgeClLogMessage,
        .rumble = BridgeClRumble,
        .connectionStatusUpdate = BridgeClConnectionStatusUpdate,
-        .setHdrMode = BridgeClSetHdrMode,
 };

 JNIEXPORT jint JNICALL
@@ -395,8 +373,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
                                                           jint clientRefreshRateX100,
                                                           jint encryptionFlags,
                                                           jbyteArray riAesKey, jbyteArray riAesIv,
-                                                           jint videoCapabilities,
-                                                           jint colorSpace, jint colorRange) {
+                                                           jint videoCapabilities) {
    SERVER_INFORMATION serverInfo = {
            .address = (*env)->GetStringUTFChars(env, address, 0),
            .serverInfoAppVersion = (*env)->GetStringUTFChars(env, appVersion, 0),
@@ -416,8 +393,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass c
            .hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier,
            .clientRefreshRateX100 = clientRefreshRateX100,
            .encryptionFlags = encryptionFlags,
-            .colorSpace = colorSpace,
-            .colorRange = colorRange
    };

    jbyte* riAesKeyBuf = (*env)->GetByteArrayElements(env, riAesKey, NULL);
@@ -1,592 +0,0 @@
-/*
- * WARNING: do not edit!
- * Generated by Makefile from include/openssl/cmp.h.in
- *
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
- * Copyright Nokia 2007-2019
- * Copyright Siemens AG 2015-2019
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-
-
-#ifndef OPENSSL_CMP_H
-# define OPENSSL_CMP_H
-
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_CMP
-
-#  include <openssl/crmf.h>
-#  include <openssl/cmperr.h>
-#  include <openssl/cmp_util.h>
-#  include <openssl/http.h>
-
-/* explicit #includes not strictly needed since implied by the above: */
-#  include <openssl/types.h>
-#  include <openssl/safestack.h>
-#  include <openssl/x509.h>
-#  include <openssl/x509v3.h>
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-#  define OSSL_CMP_PVNO 2
-
-/*-
- *   PKIFailureInfo ::= BIT STRING {
- *   -- since we can fail in more than one way!
- *   -- More codes may be added in the future if/when required.
- *       badAlg              (0),
- *       -- unrecognized or unsupported Algorithm Identifier
- *       badMessageCheck     (1),
- *       -- integrity check failed (e.g., signature did not verify)
- *       badRequest          (2),
- *       -- transaction not permitted or supported
- *       badTime             (3),
- *       -- messageTime was not sufficiently close to the system time,
- *       -- as defined by local policy
- *       badCertId           (4),
- *       -- no certificate could be found matching the provided criteria
- *       badDataFormat       (5),
- *       -- the data submitted has the wrong format
- *       wrongAuthority      (6),
- *       -- the authority indicated in the request is different from the
- *       -- one creating the response token
- *       incorrectData       (7),
- *       -- the requester's data is incorrect (for notary services)
- *       missingTimeStamp    (8),
- *       -- when the timestamp is missing but should be there
- *       -- (by policy)
- *       badPOP              (9),
- *       -- the proof-of-possession failed
- *       certRevoked         (10),
- *          -- the certificate has already been revoked
- *       certConfirmed       (11),
- *          -- the certificate has already been confirmed
- *       wrongIntegrity      (12),
- *          -- invalid integrity, password based instead of signature or
- *          -- vice versa
- *       badRecipientNonce   (13),
- *          -- invalid recipient nonce, either missing or wrong value
- *       timeNotAvailable    (14),
- *          -- the TSA's time source is not available
- *       unacceptedPolicy    (15),
- *          -- the requested TSA policy is not supported by the TSA.
- *       unacceptedExtension (16),
- *          -- the requested extension is not supported by the TSA.
- *       addInfoNotAvailable (17),
- *          -- the additional information requested could not be
- *          -- understood or is not available
- *       badSenderNonce      (18),
- *          -- invalid sender nonce, either missing or wrong size
- *       badCertTemplate     (19),
- *          -- invalid cert. template or missing mandatory information
- *       signerNotTrusted    (20),
- *          -- signer of the message unknown or not trusted
- *       transactionIdInUse  (21),
- *          -- the transaction identifier is already in use
- *       unsupportedVersion  (22),
- *          -- the version of the message is not supported
- *       notAuthorized       (23),
- *          -- the sender was not authorized to make the preceding
- *          -- request or perform the preceding action
- *       systemUnavail       (24),
- *       -- the request cannot be handled due to system unavailability
- *       systemFailure       (25),
- *       -- the request cannot be handled due to system failure
- *       duplicateCertReq    (26)
- *       -- certificate cannot be issued because a duplicate
- *       -- certificate already exists
- *   }
- */
-#  define OSSL_CMP_PKIFAILUREINFO_badAlg 0
-#  define OSSL_CMP_PKIFAILUREINFO_badMessageCheck 1
-#  define OSSL_CMP_PKIFAILUREINFO_badRequest 2
-#  define OSSL_CMP_PKIFAILUREINFO_badTime 3
-#  define OSSL_CMP_PKIFAILUREINFO_badCertId 4
-#  define OSSL_CMP_PKIFAILUREINFO_badDataFormat 5
-#  define OSSL_CMP_PKIFAILUREINFO_wrongAuthority 6
-#  define OSSL_CMP_PKIFAILUREINFO_incorrectData 7
-#  define OSSL_CMP_PKIFAILUREINFO_missingTimeStamp 8
-#  define OSSL_CMP_PKIFAILUREINFO_badPOP 9
-#  define OSSL_CMP_PKIFAILUREINFO_certRevoked 10
-#  define OSSL_CMP_PKIFAILUREINFO_certConfirmed 11
-#  define OSSL_CMP_PKIFAILUREINFO_wrongIntegrity 12
-#  define OSSL_CMP_PKIFAILUREINFO_badRecipientNonce 13
-#  define OSSL_CMP_PKIFAILUREINFO_timeNotAvailable 14
-#  define OSSL_CMP_PKIFAILUREINFO_unacceptedPolicy 15
-#  define OSSL_CMP_PKIFAILUREINFO_unacceptedExtension 16
-#  define OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable 17
-#  define OSSL_CMP_PKIFAILUREINFO_badSenderNonce 18
-#  define OSSL_CMP_PKIFAILUREINFO_badCertTemplate 19
-#  define OSSL_CMP_PKIFAILUREINFO_signerNotTrusted 20
-#  define OSSL_CMP_PKIFAILUREINFO_transactionIdInUse 21
-#  define OSSL_CMP_PKIFAILUREINFO_unsupportedVersion 22
-#  define OSSL_CMP_PKIFAILUREINFO_notAuthorized 23
-#  define OSSL_CMP_PKIFAILUREINFO_systemUnavail 24
-#  define OSSL_CMP_PKIFAILUREINFO_systemFailure 25
-#  define OSSL_CMP_PKIFAILUREINFO_duplicateCertReq 26
-#  define OSSL_CMP_PKIFAILUREINFO_MAX 26
-#  define OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN \
-    ((1 << (OSSL_CMP_PKIFAILUREINFO_MAX + 1)) - 1)
-#  if OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN > INT_MAX
-#   error CMP_PKIFAILUREINFO_MAX bit pattern does not fit in type int
-#  endif
-
-typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
-
-#  define OSSL_CMP_CTX_FAILINFO_badAlg (1 << 0)
-#  define OSSL_CMP_CTX_FAILINFO_badMessageCheck (1 << 1)
-#  define OSSL_CMP_CTX_FAILINFO_badRequest (1 << 2)
-#  define OSSL_CMP_CTX_FAILINFO_badTime (1 << 3)
-#  define OSSL_CMP_CTX_FAILINFO_badCertId (1 << 4)
-#  define OSSL_CMP_CTX_FAILINFO_badDataFormat (1 << 5)
-#  define OSSL_CMP_CTX_FAILINFO_wrongAuthority (1 << 6)
-#  define OSSL_CMP_CTX_FAILINFO_incorrectData (1 << 7)
-#  define OSSL_CMP_CTX_FAILINFO_missingTimeStamp (1 << 8)
-#  define OSSL_CMP_CTX_FAILINFO_badPOP (1 << 9)
-#  define OSSL_CMP_CTX_FAILINFO_certRevoked (1 << 10)
-#  define OSSL_CMP_CTX_FAILINFO_certConfirmed (1 << 11)
-#  define OSSL_CMP_CTX_FAILINFO_wrongIntegrity (1 << 12)
-#  define OSSL_CMP_CTX_FAILINFO_badRecipientNonce (1 << 13)
-#  define OSSL_CMP_CTX_FAILINFO_timeNotAvailable (1 << 14)
-#  define OSSL_CMP_CTX_FAILINFO_unacceptedPolicy (1 << 15)
-#  define OSSL_CMP_CTX_FAILINFO_unacceptedExtension (1 << 16)
-#  define OSSL_CMP_CTX_FAILINFO_addInfoNotAvailable (1 << 17)
-#  define OSSL_CMP_CTX_FAILINFO_badSenderNonce (1 << 18)
-#  define OSSL_CMP_CTX_FAILINFO_badCertTemplate (1 << 19)
-#  define OSSL_CMP_CTX_FAILINFO_signerNotTrusted (1 << 20)
-#  define OSSL_CMP_CTX_FAILINFO_transactionIdInUse (1 << 21)
-#  define OSSL_CMP_CTX_FAILINFO_unsupportedVersion (1 << 22)
-#  define OSSL_CMP_CTX_FAILINFO_notAuthorized (1 << 23)
-#  define OSSL_CMP_CTX_FAILINFO_systemUnavail (1 << 24)
-#  define OSSL_CMP_CTX_FAILINFO_systemFailure (1 << 25)
-#  define OSSL_CMP_CTX_FAILINFO_duplicateCertReq (1 << 26)
-
-/*-
- *   PKIStatus ::= INTEGER {
- *       accepted                (0),
- *       -- you got exactly what you asked for
- *       grantedWithMods        (1),
- *       -- you got something like what you asked for; the
- *       -- requester is responsible for ascertaining the differences
- *       rejection              (2),
- *       -- you don't get it, more information elsewhere in the message
- *       waiting                (3),
- *       -- the request body part has not yet been processed; expect to
- *       -- hear more later (note: proper handling of this status
- *       -- response MAY use the polling req/rep PKIMessages specified
- *       -- in Section 5.3.22; alternatively, polling in the underlying
- *       -- transport layer MAY have some utility in this regard)
- *       revocationWarning      (4),
- *       -- this message contains a warning that a revocation is
- *       -- imminent
- *       revocationNotification (5),
- *       -- notification that a revocation has occurred
- *       keyUpdateWarning       (6)
- *       -- update already done for the oldCertId specified in
- *       -- CertReqMsg
- *   }
- */
-#  define OSSL_CMP_PKISTATUS_accepted 0
-#  define OSSL_CMP_PKISTATUS_grantedWithMods 1
-#  define OSSL_CMP_PKISTATUS_rejection 2
-#  define OSSL_CMP_PKISTATUS_waiting 3
-#  define OSSL_CMP_PKISTATUS_revocationWarning 4
-#  define OSSL_CMP_PKISTATUS_revocationNotification 5
-#  define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
-
-typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
-DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
-
-#  define OSSL_CMP_CERTORENCCERT_CERTIFICATE 0
-#  define OSSL_CMP_CERTORENCCERT_ENCRYPTEDCERT 1
-
-/* data type declarations */
-typedef struct ossl_cmp_ctx_st OSSL_CMP_CTX;
-typedef struct ossl_cmp_pkiheader_st OSSL_CMP_PKIHEADER;
-DECLARE_ASN1_FUNCTIONS(OSSL_CMP_PKIHEADER)
-typedef struct ossl_cmp_msg_st OSSL_CMP_MSG;
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_MSG)
-DECLARE_ASN1_ENCODE_FUNCTIONS(OSSL_CMP_MSG, OSSL_CMP_MSG, OSSL_CMP_MSG)
-typedef struct ossl_cmp_certstatus_st OSSL_CMP_CERTSTATUS;
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CMP_CERTSTATUS, OSSL_CMP_CERTSTATUS, OSSL_CMP_CERTSTATUS)
-#define sk_OSSL_CMP_CERTSTATUS_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CMP_CERTSTATUS_sk_type(sk))
-#define sk_OSSL_CMP_CERTSTATUS_value(sk, idx) ((OSSL_CMP_CERTSTATUS *)OPENSSL_sk_value(ossl_check_const_OSSL_CMP_CERTSTATUS_sk_type(sk), (idx)))
-#define sk_OSSL_CMP_CERTSTATUS_new(cmp) ((STACK_OF(OSSL_CMP_CERTSTATUS) *)OPENSSL_sk_new(ossl_check_OSSL_CMP_CERTSTATUS_compfunc_type(cmp)))
-#define sk_OSSL_CMP_CERTSTATUS_new_null() ((STACK_OF(OSSL_CMP_CERTSTATUS) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CMP_CERTSTATUS_new_reserve(cmp, n) ((STACK_OF(OSSL_CMP_CERTSTATUS) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CMP_CERTSTATUS_compfunc_type(cmp), (n)))
-#define sk_OSSL_CMP_CERTSTATUS_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), (n))
-#define sk_OSSL_CMP_CERTSTATUS_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk))
-#define sk_OSSL_CMP_CERTSTATUS_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk))
-#define sk_OSSL_CMP_CERTSTATUS_delete(sk, i) ((OSSL_CMP_CERTSTATUS *)OPENSSL_sk_delete(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), (i)))
-#define sk_OSSL_CMP_CERTSTATUS_delete_ptr(sk, ptr) ((OSSL_CMP_CERTSTATUS *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr)))
-#define sk_OSSL_CMP_CERTSTATUS_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr))
-#define sk_OSSL_CMP_CERTSTATUS_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr))
-#define sk_OSSL_CMP_CERTSTATUS_pop(sk) ((OSSL_CMP_CERTSTATUS *)OPENSSL_sk_pop(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk)))
-#define sk_OSSL_CMP_CERTSTATUS_shift(sk) ((OSSL_CMP_CERTSTATUS *)OPENSSL_sk_shift(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk)))
-#define sk_OSSL_CMP_CERTSTATUS_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk),ossl_check_OSSL_CMP_CERTSTATUS_freefunc_type(freefunc))
-#define sk_OSSL_CMP_CERTSTATUS_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr), (idx))
-#define sk_OSSL_CMP_CERTSTATUS_set(sk, idx, ptr) ((OSSL_CMP_CERTSTATUS *)OPENSSL_sk_set(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), (idx), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr)))
-#define sk_OSSL_CMP_CERTSTATUS_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr))
-#define sk_OSSL_CMP_CERTSTATUS_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr))
-#define sk_OSSL_CMP_CERTSTATUS_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_type(ptr), pnum)
-#define sk_OSSL_CMP_CERTSTATUS_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk))
-#define sk_OSSL_CMP_CERTSTATUS_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CMP_CERTSTATUS_sk_type(sk))
-#define sk_OSSL_CMP_CERTSTATUS_dup(sk) ((STACK_OF(OSSL_CMP_CERTSTATUS) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CMP_CERTSTATUS_sk_type(sk)))
-#define sk_OSSL_CMP_CERTSTATUS_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CMP_CERTSTATUS) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_copyfunc_type(copyfunc), ossl_check_OSSL_CMP_CERTSTATUS_freefunc_type(freefunc)))
-#define sk_OSSL_CMP_CERTSTATUS_set_cmp_func(sk, cmp) ((sk_OSSL_CMP_CERTSTATUS_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CMP_CERTSTATUS_sk_type(sk), ossl_check_OSSL_CMP_CERTSTATUS_compfunc_type(cmp)))
-
-typedef struct ossl_cmp_itav_st OSSL_CMP_ITAV;
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_ITAV)
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CMP_ITAV, OSSL_CMP_ITAV, OSSL_CMP_ITAV)
-#define sk_OSSL_CMP_ITAV_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CMP_ITAV_sk_type(sk))
-#define sk_OSSL_CMP_ITAV_value(sk, idx) ((OSSL_CMP_ITAV *)OPENSSL_sk_value(ossl_check_const_OSSL_CMP_ITAV_sk_type(sk), (idx)))
-#define sk_OSSL_CMP_ITAV_new(cmp) ((STACK_OF(OSSL_CMP_ITAV) *)OPENSSL_sk_new(ossl_check_OSSL_CMP_ITAV_compfunc_type(cmp)))
-#define sk_OSSL_CMP_ITAV_new_null() ((STACK_OF(OSSL_CMP_ITAV) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CMP_ITAV_new_reserve(cmp, n) ((STACK_OF(OSSL_CMP_ITAV) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CMP_ITAV_compfunc_type(cmp), (n)))
-#define sk_OSSL_CMP_ITAV_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CMP_ITAV_sk_type(sk), (n))
-#define sk_OSSL_CMP_ITAV_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CMP_ITAV_sk_type(sk))
-#define sk_OSSL_CMP_ITAV_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CMP_ITAV_sk_type(sk))
-#define sk_OSSL_CMP_ITAV_delete(sk, i) ((OSSL_CMP_ITAV *)OPENSSL_sk_delete(ossl_check_OSSL_CMP_ITAV_sk_type(sk), (i)))
-#define sk_OSSL_CMP_ITAV_delete_ptr(sk, ptr) ((OSSL_CMP_ITAV *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr)))
-#define sk_OSSL_CMP_ITAV_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr))
-#define sk_OSSL_CMP_ITAV_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr))
-#define sk_OSSL_CMP_ITAV_pop(sk) ((OSSL_CMP_ITAV *)OPENSSL_sk_pop(ossl_check_OSSL_CMP_ITAV_sk_type(sk)))
-#define sk_OSSL_CMP_ITAV_shift(sk) ((OSSL_CMP_ITAV *)OPENSSL_sk_shift(ossl_check_OSSL_CMP_ITAV_sk_type(sk)))
-#define sk_OSSL_CMP_ITAV_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CMP_ITAV_sk_type(sk),ossl_check_OSSL_CMP_ITAV_freefunc_type(freefunc))
-#define sk_OSSL_CMP_ITAV_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr), (idx))
-#define sk_OSSL_CMP_ITAV_set(sk, idx, ptr) ((OSSL_CMP_ITAV *)OPENSSL_sk_set(ossl_check_OSSL_CMP_ITAV_sk_type(sk), (idx), ossl_check_OSSL_CMP_ITAV_type(ptr)))
-#define sk_OSSL_CMP_ITAV_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr))
-#define sk_OSSL_CMP_ITAV_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr))
-#define sk_OSSL_CMP_ITAV_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_type(ptr), pnum)
-#define sk_OSSL_CMP_ITAV_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CMP_ITAV_sk_type(sk))
-#define sk_OSSL_CMP_ITAV_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CMP_ITAV_sk_type(sk))
-#define sk_OSSL_CMP_ITAV_dup(sk) ((STACK_OF(OSSL_CMP_ITAV) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CMP_ITAV_sk_type(sk)))
-#define sk_OSSL_CMP_ITAV_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CMP_ITAV) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_copyfunc_type(copyfunc), ossl_check_OSSL_CMP_ITAV_freefunc_type(freefunc)))
-#define sk_OSSL_CMP_ITAV_set_cmp_func(sk, cmp) ((sk_OSSL_CMP_ITAV_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CMP_ITAV_sk_type(sk), ossl_check_OSSL_CMP_ITAV_compfunc_type(cmp)))
-
-typedef struct ossl_cmp_revrepcontent_st OSSL_CMP_REVREPCONTENT;
-typedef struct ossl_cmp_pkisi_st OSSL_CMP_PKISI;
-DECLARE_ASN1_FUNCTIONS(OSSL_CMP_PKISI)
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_PKISI)
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CMP_PKISI, OSSL_CMP_PKISI, OSSL_CMP_PKISI)
-#define sk_OSSL_CMP_PKISI_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CMP_PKISI_sk_type(sk))
-#define sk_OSSL_CMP_PKISI_value(sk, idx) ((OSSL_CMP_PKISI *)OPENSSL_sk_value(ossl_check_const_OSSL_CMP_PKISI_sk_type(sk), (idx)))
-#define sk_OSSL_CMP_PKISI_new(cmp) ((STACK_OF(OSSL_CMP_PKISI) *)OPENSSL_sk_new(ossl_check_OSSL_CMP_PKISI_compfunc_type(cmp)))
-#define sk_OSSL_CMP_PKISI_new_null() ((STACK_OF(OSSL_CMP_PKISI) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CMP_PKISI_new_reserve(cmp, n) ((STACK_OF(OSSL_CMP_PKISI) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CMP_PKISI_compfunc_type(cmp), (n)))
-#define sk_OSSL_CMP_PKISI_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CMP_PKISI_sk_type(sk), (n))
-#define sk_OSSL_CMP_PKISI_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CMP_PKISI_sk_type(sk))
-#define sk_OSSL_CMP_PKISI_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CMP_PKISI_sk_type(sk))
-#define sk_OSSL_CMP_PKISI_delete(sk, i) ((OSSL_CMP_PKISI *)OPENSSL_sk_delete(ossl_check_OSSL_CMP_PKISI_sk_type(sk), (i)))
-#define sk_OSSL_CMP_PKISI_delete_ptr(sk, ptr) ((OSSL_CMP_PKISI *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr)))
-#define sk_OSSL_CMP_PKISI_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr))
-#define sk_OSSL_CMP_PKISI_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr))
-#define sk_OSSL_CMP_PKISI_pop(sk) ((OSSL_CMP_PKISI *)OPENSSL_sk_pop(ossl_check_OSSL_CMP_PKISI_sk_type(sk)))
-#define sk_OSSL_CMP_PKISI_shift(sk) ((OSSL_CMP_PKISI *)OPENSSL_sk_shift(ossl_check_OSSL_CMP_PKISI_sk_type(sk)))
-#define sk_OSSL_CMP_PKISI_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CMP_PKISI_sk_type(sk),ossl_check_OSSL_CMP_PKISI_freefunc_type(freefunc))
-#define sk_OSSL_CMP_PKISI_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr), (idx))
-#define sk_OSSL_CMP_PKISI_set(sk, idx, ptr) ((OSSL_CMP_PKISI *)OPENSSL_sk_set(ossl_check_OSSL_CMP_PKISI_sk_type(sk), (idx), ossl_check_OSSL_CMP_PKISI_type(ptr)))
-#define sk_OSSL_CMP_PKISI_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr))
-#define sk_OSSL_CMP_PKISI_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr))
-#define sk_OSSL_CMP_PKISI_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_type(ptr), pnum)
-#define sk_OSSL_CMP_PKISI_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CMP_PKISI_sk_type(sk))
-#define sk_OSSL_CMP_PKISI_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CMP_PKISI_sk_type(sk))
-#define sk_OSSL_CMP_PKISI_dup(sk) ((STACK_OF(OSSL_CMP_PKISI) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CMP_PKISI_sk_type(sk)))
-#define sk_OSSL_CMP_PKISI_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CMP_PKISI) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_copyfunc_type(copyfunc), ossl_check_OSSL_CMP_PKISI_freefunc_type(freefunc)))
-#define sk_OSSL_CMP_PKISI_set_cmp_func(sk, cmp) ((sk_OSSL_CMP_PKISI_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CMP_PKISI_sk_type(sk), ossl_check_OSSL_CMP_PKISI_compfunc_type(cmp)))
-
-typedef struct ossl_cmp_certrepmessage_st OSSL_CMP_CERTREPMESSAGE;
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CMP_CERTREPMESSAGE, OSSL_CMP_CERTREPMESSAGE, OSSL_CMP_CERTREPMESSAGE)
-#define sk_OSSL_CMP_CERTREPMESSAGE_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CMP_CERTREPMESSAGE_sk_type(sk))
-#define sk_OSSL_CMP_CERTREPMESSAGE_value(sk, idx) ((OSSL_CMP_CERTREPMESSAGE *)OPENSSL_sk_value(ossl_check_const_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), (idx)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_new(cmp) ((STACK_OF(OSSL_CMP_CERTREPMESSAGE) *)OPENSSL_sk_new(ossl_check_OSSL_CMP_CERTREPMESSAGE_compfunc_type(cmp)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_new_null() ((STACK_OF(OSSL_CMP_CERTREPMESSAGE) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CMP_CERTREPMESSAGE_new_reserve(cmp, n) ((STACK_OF(OSSL_CMP_CERTREPMESSAGE) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CMP_CERTREPMESSAGE_compfunc_type(cmp), (n)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), (n))
-#define sk_OSSL_CMP_CERTREPMESSAGE_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk))
-#define sk_OSSL_CMP_CERTREPMESSAGE_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk))
-#define sk_OSSL_CMP_CERTREPMESSAGE_delete(sk, i) ((OSSL_CMP_CERTREPMESSAGE *)OPENSSL_sk_delete(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), (i)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_delete_ptr(sk, ptr) ((OSSL_CMP_CERTREPMESSAGE *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr))
-#define sk_OSSL_CMP_CERTREPMESSAGE_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr))
-#define sk_OSSL_CMP_CERTREPMESSAGE_pop(sk) ((OSSL_CMP_CERTREPMESSAGE *)OPENSSL_sk_pop(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_shift(sk) ((OSSL_CMP_CERTREPMESSAGE *)OPENSSL_sk_shift(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk),ossl_check_OSSL_CMP_CERTREPMESSAGE_freefunc_type(freefunc))
-#define sk_OSSL_CMP_CERTREPMESSAGE_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr), (idx))
-#define sk_OSSL_CMP_CERTREPMESSAGE_set(sk, idx, ptr) ((OSSL_CMP_CERTREPMESSAGE *)OPENSSL_sk_set(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), (idx), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr))
-#define sk_OSSL_CMP_CERTREPMESSAGE_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr))
-#define sk_OSSL_CMP_CERTREPMESSAGE_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_type(ptr), pnum)
-#define sk_OSSL_CMP_CERTREPMESSAGE_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk))
-#define sk_OSSL_CMP_CERTREPMESSAGE_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CMP_CERTREPMESSAGE_sk_type(sk))
-#define sk_OSSL_CMP_CERTREPMESSAGE_dup(sk) ((STACK_OF(OSSL_CMP_CERTREPMESSAGE) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CMP_CERTREPMESSAGE_sk_type(sk)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CMP_CERTREPMESSAGE) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_copyfunc_type(copyfunc), ossl_check_OSSL_CMP_CERTREPMESSAGE_freefunc_type(freefunc)))
-#define sk_OSSL_CMP_CERTREPMESSAGE_set_cmp_func(sk, cmp) ((sk_OSSL_CMP_CERTREPMESSAGE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CMP_CERTREPMESSAGE_sk_type(sk), ossl_check_OSSL_CMP_CERTREPMESSAGE_compfunc_type(cmp)))
-
-typedef struct ossl_cmp_pollrep_st OSSL_CMP_POLLREP;
-typedef STACK_OF(OSSL_CMP_POLLREP) OSSL_CMP_POLLREPCONTENT;
-typedef struct ossl_cmp_certresponse_st OSSL_CMP_CERTRESPONSE;
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CMP_CERTRESPONSE, OSSL_CMP_CERTRESPONSE, OSSL_CMP_CERTRESPONSE)
-#define sk_OSSL_CMP_CERTRESPONSE_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CMP_CERTRESPONSE_sk_type(sk))
-#define sk_OSSL_CMP_CERTRESPONSE_value(sk, idx) ((OSSL_CMP_CERTRESPONSE *)OPENSSL_sk_value(ossl_check_const_OSSL_CMP_CERTRESPONSE_sk_type(sk), (idx)))
-#define sk_OSSL_CMP_CERTRESPONSE_new(cmp) ((STACK_OF(OSSL_CMP_CERTRESPONSE) *)OPENSSL_sk_new(ossl_check_OSSL_CMP_CERTRESPONSE_compfunc_type(cmp)))
-#define sk_OSSL_CMP_CERTRESPONSE_new_null() ((STACK_OF(OSSL_CMP_CERTRESPONSE) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CMP_CERTRESPONSE_new_reserve(cmp, n) ((STACK_OF(OSSL_CMP_CERTRESPONSE) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CMP_CERTRESPONSE_compfunc_type(cmp), (n)))
-#define sk_OSSL_CMP_CERTRESPONSE_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), (n))
-#define sk_OSSL_CMP_CERTRESPONSE_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk))
-#define sk_OSSL_CMP_CERTRESPONSE_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk))
-#define sk_OSSL_CMP_CERTRESPONSE_delete(sk, i) ((OSSL_CMP_CERTRESPONSE *)OPENSSL_sk_delete(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), (i)))
-#define sk_OSSL_CMP_CERTRESPONSE_delete_ptr(sk, ptr) ((OSSL_CMP_CERTRESPONSE *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr)))
-#define sk_OSSL_CMP_CERTRESPONSE_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr))
-#define sk_OSSL_CMP_CERTRESPONSE_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr))
-#define sk_OSSL_CMP_CERTRESPONSE_pop(sk) ((OSSL_CMP_CERTRESPONSE *)OPENSSL_sk_pop(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk)))
-#define sk_OSSL_CMP_CERTRESPONSE_shift(sk) ((OSSL_CMP_CERTRESPONSE *)OPENSSL_sk_shift(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk)))
-#define sk_OSSL_CMP_CERTRESPONSE_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk),ossl_check_OSSL_CMP_CERTRESPONSE_freefunc_type(freefunc))
-#define sk_OSSL_CMP_CERTRESPONSE_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr), (idx))
-#define sk_OSSL_CMP_CERTRESPONSE_set(sk, idx, ptr) ((OSSL_CMP_CERTRESPONSE *)OPENSSL_sk_set(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), (idx), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr)))
-#define sk_OSSL_CMP_CERTRESPONSE_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr))
-#define sk_OSSL_CMP_CERTRESPONSE_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr))
-#define sk_OSSL_CMP_CERTRESPONSE_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_type(ptr), pnum)
-#define sk_OSSL_CMP_CERTRESPONSE_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk))
-#define sk_OSSL_CMP_CERTRESPONSE_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CMP_CERTRESPONSE_sk_type(sk))
-#define sk_OSSL_CMP_CERTRESPONSE_dup(sk) ((STACK_OF(OSSL_CMP_CERTRESPONSE) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CMP_CERTRESPONSE_sk_type(sk)))
-#define sk_OSSL_CMP_CERTRESPONSE_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CMP_CERTRESPONSE) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_copyfunc_type(copyfunc), ossl_check_OSSL_CMP_CERTRESPONSE_freefunc_type(freefunc)))
-#define sk_OSSL_CMP_CERTRESPONSE_set_cmp_func(sk, cmp) ((sk_OSSL_CMP_CERTRESPONSE_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CMP_CERTRESPONSE_sk_type(sk), ossl_check_OSSL_CMP_CERTRESPONSE_compfunc_type(cmp)))
-
-typedef STACK_OF(ASN1_UTF8STRING) OSSL_CMP_PKIFREETEXT;
-
-/*
- * function DECLARATIONS
- */
-
-/* from cmp_asn.c */
-OSSL_CMP_ITAV *OSSL_CMP_ITAV_create(ASN1_OBJECT *type, ASN1_TYPE *value);
-void OSSL_CMP_ITAV_set0(OSSL_CMP_ITAV *itav, ASN1_OBJECT *type,
-                        ASN1_TYPE *value);
-ASN1_OBJECT *OSSL_CMP_ITAV_get0_type(const OSSL_CMP_ITAV *itav);
-ASN1_TYPE *OSSL_CMP_ITAV_get0_value(const OSSL_CMP_ITAV *itav);
-int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
-                                   OSSL_CMP_ITAV *itav);
-void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
-void OSSL_CMP_MSG_free(OSSL_CMP_MSG *msg);
-
-/* from cmp_ctx.c */
-OSSL_CMP_CTX *OSSL_CMP_CTX_new(OSSL_LIB_CTX *libctx, const char *propq);
-void OSSL_CMP_CTX_free(OSSL_CMP_CTX *ctx);
-int OSSL_CMP_CTX_reinit(OSSL_CMP_CTX *ctx);
-/* CMP general options: */
-#  define OSSL_CMP_OPT_LOG_VERBOSITY 0
-/* CMP transfer options: */
-#  define OSSL_CMP_OPT_KEEP_ALIVE 10
-#  define OSSL_CMP_OPT_MSG_TIMEOUT 11
-#  define OSSL_CMP_OPT_TOTAL_TIMEOUT 12
-/* CMP request options: */
-#  define OSSL_CMP_OPT_VALIDITY_DAYS 20
-#  define OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT 21
-#  define OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL 22
-#  define OSSL_CMP_OPT_POLICIES_CRITICAL 23
-#  define OSSL_CMP_OPT_POPO_METHOD 24
-#  define OSSL_CMP_OPT_IMPLICIT_CONFIRM 25
-#  define OSSL_CMP_OPT_DISABLE_CONFIRM 26
-#  define OSSL_CMP_OPT_REVOCATION_REASON 27
-/* CMP protection options: */
-#  define OSSL_CMP_OPT_UNPROTECTED_SEND 30
-#  define OSSL_CMP_OPT_UNPROTECTED_ERRORS 31
-#  define OSSL_CMP_OPT_OWF_ALGNID 32
-#  define OSSL_CMP_OPT_MAC_ALGNID 33
-#  define OSSL_CMP_OPT_DIGEST_ALGNID 34
-#  define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
-#  define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
-int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
-int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
-/* CMP-specific callback for logging and outputting the error queue: */
-int OSSL_CMP_CTX_set_log_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_log_cb_t cb);
-#  define OSSL_CMP_CTX_set_log_verbosity(ctx, level) \
-    OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_LOG_VERBOSITY, level)
-void OSSL_CMP_CTX_print_errors(const OSSL_CMP_CTX *ctx);
-/* message transfer: */
-int OSSL_CMP_CTX_set1_serverPath(OSSL_CMP_CTX *ctx, const char *path);
-int OSSL_CMP_CTX_set1_server(OSSL_CMP_CTX *ctx, const char *address);
-int OSSL_CMP_CTX_set_serverPort(OSSL_CMP_CTX *ctx, int port);
-int OSSL_CMP_CTX_set1_proxy(OSSL_CMP_CTX *ctx, const char *name);
-int OSSL_CMP_CTX_set1_no_proxy(OSSL_CMP_CTX *ctx, const char *names);
-int OSSL_CMP_CTX_set_http_cb(OSSL_CMP_CTX *ctx, OSSL_HTTP_bio_cb_t cb);
-int OSSL_CMP_CTX_set_http_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
-void *OSSL_CMP_CTX_get_http_cb_arg(const OSSL_CMP_CTX *ctx);
-typedef OSSL_CMP_MSG *(*OSSL_CMP_transfer_cb_t) (OSSL_CMP_CTX *ctx,
-                                                 const OSSL_CMP_MSG *req);
-int OSSL_CMP_CTX_set_transfer_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_transfer_cb_t cb);
-int OSSL_CMP_CTX_set_transfer_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
-void *OSSL_CMP_CTX_get_transfer_cb_arg(const OSSL_CMP_CTX *ctx);
-/* server authentication: */
-int OSSL_CMP_CTX_set1_srvCert(OSSL_CMP_CTX *ctx, X509 *cert);
-int OSSL_CMP_CTX_set1_expected_sender(OSSL_CMP_CTX *ctx, const X509_NAME *name);
-int OSSL_CMP_CTX_set0_trustedStore(OSSL_CMP_CTX *ctx, X509_STORE *store);
-X509_STORE *OSSL_CMP_CTX_get0_trustedStore(const OSSL_CMP_CTX *ctx);
-int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs);
-STACK_OF(X509) *OSSL_CMP_CTX_get0_untrusted(const OSSL_CMP_CTX *ctx);
-/* client authentication: */
-int OSSL_CMP_CTX_set1_cert(OSSL_CMP_CTX *ctx, X509 *cert);
-int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
-                                  STACK_OF(X509) *candidates);
-int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
-int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
-                                     const unsigned char *ref, int len);
-int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec,
-                                  const int len);
-/* CMP message header and extra certificates: */
-int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
-int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
-int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
-                                    STACK_OF(X509) *extraCertsOut);
-/* certificate template: */
-int OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_CTX *ctx, int priv, EVP_PKEY *pkey);
-EVP_PKEY *OSSL_CMP_CTX_get0_newPkey(const OSSL_CMP_CTX *ctx, int priv);
-int OSSL_CMP_CTX_set1_issuer(OSSL_CMP_CTX *ctx, const X509_NAME *name);
-int OSSL_CMP_CTX_set1_subjectName(OSSL_CMP_CTX *ctx, const X509_NAME *name);
-int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
-                                      const GENERAL_NAME *name);
-int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts);
-int OSSL_CMP_CTX_reqExtensions_have_SAN(OSSL_CMP_CTX *ctx);
-int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo);
-int OSSL_CMP_CTX_set1_oldCert(OSSL_CMP_CTX *ctx, X509 *cert);
-int OSSL_CMP_CTX_set1_p10CSR(OSSL_CMP_CTX *ctx, const X509_REQ *csr);
-/* misc body contents: */
-int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
-/* certificate confirmation: */
-typedef int (*OSSL_CMP_certConf_cb_t) (OSSL_CMP_CTX *ctx, X509 *cert,
-                                       int fail_info, const char **txt);
-int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
-                         const char **text);
-int OSSL_CMP_CTX_set_certConf_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_certConf_cb_t cb);
-int OSSL_CMP_CTX_set_certConf_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
-void *OSSL_CMP_CTX_get_certConf_cb_arg(const OSSL_CMP_CTX *ctx);
-/* result fetching: */
-int OSSL_CMP_CTX_get_status(const OSSL_CMP_CTX *ctx);
-OSSL_CMP_PKIFREETEXT *OSSL_CMP_CTX_get0_statusString(const OSSL_CMP_CTX *ctx);
-int OSSL_CMP_CTX_get_failInfoCode(const OSSL_CMP_CTX *ctx);
-#  define OSSL_CMP_PKISI_BUFLEN 1024
-X509 *OSSL_CMP_CTX_get0_newCert(const OSSL_CMP_CTX *ctx);
-STACK_OF(X509) *OSSL_CMP_CTX_get1_newChain(const OSSL_CMP_CTX *ctx);
-STACK_OF(X509) *OSSL_CMP_CTX_get1_caPubs(const OSSL_CMP_CTX *ctx);
-STACK_OF(X509) *OSSL_CMP_CTX_get1_extraCertsIn(const OSSL_CMP_CTX *ctx);
-int OSSL_CMP_CTX_set1_transactionID(OSSL_CMP_CTX *ctx,
-                                    const ASN1_OCTET_STRING *id);
-int OSSL_CMP_CTX_set1_senderNonce(OSSL_CMP_CTX *ctx,
-                                  const ASN1_OCTET_STRING *nonce);
-
-/* from cmp_status.c */
-char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
-                                     size_t bufsize);
-char *OSSL_CMP_snprint_PKIStatusInfo(const OSSL_CMP_PKISI *statusInfo,
-                                     char *buf, size_t bufsize);
-OSSL_CMP_PKISI *
-OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
-
-/* from cmp_hdr.c */
-ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
-                                                   OSSL_CMP_PKIHEADER *hdr);
-ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
-
-/* from cmp_msg.c */
-OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
-int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
-int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
-OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
-OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
-                                const char *propq);
-int OSSL_CMP_MSG_write(const char *file, const OSSL_CMP_MSG *msg);
-OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg);
-int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg);
-
-/* from cmp_vfy.c */
-int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg);
-int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
-                                X509_STORE *trusted_store, X509 *cert);
-
-/* from cmp_http.c */
-OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
-                                        const OSSL_CMP_MSG *req);
-
-/* from cmp_server.c */
-typedef struct ossl_cmp_srv_ctx_st OSSL_CMP_SRV_CTX;
-OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                           const OSSL_CMP_MSG *req);
-OSSL_CMP_MSG * OSSL_CMP_CTX_server_perform(OSSL_CMP_CTX *client_ctx,
-                                           const OSSL_CMP_MSG *req);
-OSSL_CMP_SRV_CTX *OSSL_CMP_SRV_CTX_new(OSSL_LIB_CTX *libctx, const char *propq);
-void OSSL_CMP_SRV_CTX_free(OSSL_CMP_SRV_CTX *srv_ctx);
-typedef OSSL_CMP_PKISI *(*OSSL_CMP_SRV_cert_request_cb_t)
-    (OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *req, int certReqId,
-     const OSSL_CRMF_MSG *crm, const X509_REQ *p10cr,
-     X509 **certOut, STACK_OF(X509) **chainOut, STACK_OF(X509) **caPubs);
-typedef OSSL_CMP_PKISI *(*OSSL_CMP_SRV_rr_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                const OSSL_CMP_MSG *req,
-                                                const X509_NAME *issuer,
-                                                const ASN1_INTEGER *serial);
-typedef int (*OSSL_CMP_SRV_genm_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                      const OSSL_CMP_MSG *req,
-                                      const STACK_OF(OSSL_CMP_ITAV) *in,
-                                      STACK_OF(OSSL_CMP_ITAV) **out);
-typedef void (*OSSL_CMP_SRV_error_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                        const OSSL_CMP_MSG *req,
-                                        const OSSL_CMP_PKISI *statusInfo,
-                                        const ASN1_INTEGER *errorCode,
-                                        const OSSL_CMP_PKIFREETEXT *errDetails);
-typedef int (*OSSL_CMP_SRV_certConf_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                          const OSSL_CMP_MSG *req,
-                                          int certReqId,
-                                          const ASN1_OCTET_STRING *certHash,
-                                          const OSSL_CMP_PKISI *si);
-typedef int (*OSSL_CMP_SRV_pollReq_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                         const OSSL_CMP_MSG *req, int certReqId,
-                                         OSSL_CMP_MSG **certReq,
-                                         int64_t *check_after);
-int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
-                          OSSL_CMP_SRV_cert_request_cb_t process_cert_request,
-                          OSSL_CMP_SRV_rr_cb_t process_rr,
-                          OSSL_CMP_SRV_genm_cb_t process_genm,
-                          OSSL_CMP_SRV_error_cb_t process_error,
-                          OSSL_CMP_SRV_certConf_cb_t process_certConf,
-                          OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
-OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
-void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
-int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                 int val);
-int OSSL_CMP_SRV_CTX_set_accept_unprotected(OSSL_CMP_SRV_CTX *srv_ctx, int val);
-int OSSL_CMP_SRV_CTX_set_accept_raverified(OSSL_CMP_SRV_CTX *srv_ctx, int val);
-int OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                int val);
-
-/* from cmp_client.c */
-X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
-                            const OSSL_CRMF_MSG *crm);
-#  define OSSL_CMP_IR    0
-#  define OSSL_CMP_CR    2
-#  define OSSL_CMP_P10CR 4
-#  define OSSL_CMP_KUR   7
-#  define OSSL_CMP_exec_IR_ses(ctx) \
-    OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
-#  define OSSL_CMP_exec_CR_ses(ctx) \
-    OSSL_CMP_exec_certreq(ctx, OSSL_CMP_CR, NULL)
-#  define OSSL_CMP_exec_P10CR_ses(ctx) \
-    OSSL_CMP_exec_certreq(ctx, OSSL_CMP_P10CR, NULL)
-#  define OSSL_CMP_exec_KUR_ses(ctx) \
-    OSSL_CMP_exec_certreq(ctx, OSSL_CMP_KUR, NULL)
-int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
-                         const OSSL_CRMF_MSG *crm, int *checkAfter);
-int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx);
-STACK_OF(OSSL_CMP_ITAV) *OSSL_CMP_exec_GENM_ses(OSSL_CMP_CTX *ctx);
-
-#  ifdef  __cplusplus
-}
-#  endif
-# endif /* !defined(OPENSSL_NO_CMP) */
-#endif /* !defined(OPENSSL_CMP_H) */
@@ -1,154 +0,0 @@
-/*
- * WARNING: do not edit!
- * Generated by Makefile from include/openssl/configuration.h.in
- *
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef OPENSSL_CONFIGURATION_H
-# define OPENSSL_CONFIGURATION_H
-# pragma once
-
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-# ifdef OPENSSL_ALGORITHM_DEFINES
-#  error OPENSSL_ALGORITHM_DEFINES no longer supported
-# endif
-
-/*
- * OpenSSL was configured with the following options:
- */
-
-# define OPENSSL_CONFIGURED_API 30000
-# ifndef OPENSSL_RAND_SEED_OS
-#  define OPENSSL_RAND_SEED_OS
-# endif
-# ifndef OPENSSL_THREADS
-#  define OPENSSL_THREADS
-# endif
-# ifndef OPENSSL_NO_ACVP_TESTS
-#  define OPENSSL_NO_ACVP_TESTS
-# endif
-# ifndef OPENSSL_NO_AFALGENG
-#  define OPENSSL_NO_AFALGENG
-# endif
-# ifndef OPENSSL_NO_ASAN
-#  define OPENSSL_NO_ASAN
-# endif
-# ifndef OPENSSL_NO_CAPIENG
-#  define OPENSSL_NO_CAPIENG
-# endif
-# ifndef OPENSSL_NO_CRYPTO_MDEBUG
-#  define OPENSSL_NO_CRYPTO_MDEBUG
-# endif
-# ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-#  define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-# endif
-# ifndef OPENSSL_NO_DEPRECATED
-#  define OPENSSL_NO_DEPRECATED
-# endif
-# ifndef OPENSSL_NO_DEVCRYPTOENG
-#  define OPENSSL_NO_DEVCRYPTOENG
-# endif
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-#  define OPENSSL_NO_EC_NISTP_64_GCC_128
-# endif
-# ifndef OPENSSL_NO_EGD
-#  define OPENSSL_NO_EGD
-# endif
-# ifndef OPENSSL_NO_ENGINE
-#  define OPENSSL_NO_ENGINE
-# endif
-# ifndef OPENSSL_NO_EXTERNAL_TESTS
-#  define OPENSSL_NO_EXTERNAL_TESTS
-# endif
-# ifndef OPENSSL_NO_FIPS_SECURITYCHECKS
-#  define OPENSSL_NO_FIPS_SECURITYCHECKS
-# endif
-# ifndef OPENSSL_NO_FUZZ_AFL
-#  define OPENSSL_NO_FUZZ_AFL
-# endif
-# ifndef OPENSSL_NO_FUZZ_LIBFUZZER
-#  define OPENSSL_NO_FUZZ_LIBFUZZER
-# endif
-# ifndef OPENSSL_NO_KTLS
-#  define OPENSSL_NO_KTLS
-# endif
-# ifndef OPENSSL_NO_LOADERENG
-#  define OPENSSL_NO_LOADERENG
-# endif
-# ifndef OPENSSL_NO_MD2
-#  define OPENSSL_NO_MD2
-# endif
-# ifndef OPENSSL_NO_MSAN
-#  define OPENSSL_NO_MSAN
-# endif
-# ifndef OPENSSL_NO_PADLOCKENG
-#  define OPENSSL_NO_PADLOCKENG
-# endif
-# ifndef OPENSSL_NO_RC5
-#  define OPENSSL_NO_RC5
-# endif
-# ifndef OPENSSL_NO_SCTP
-#  define OPENSSL_NO_SCTP
-# endif
-# ifndef OPENSSL_NO_SRP
-#  define OPENSSL_NO_SRP
-# endif
-# ifndef OPENSSL_NO_SSL3
-#  define OPENSSL_NO_SSL3
-# endif
-# ifndef OPENSSL_NO_SSL3_METHOD
-#  define OPENSSL_NO_SSL3_METHOD
-# endif
-# ifndef OPENSSL_NO_TESTS
-#  define OPENSSL_NO_TESTS
-# endif
-# ifndef OPENSSL_NO_TRACE
-#  define OPENSSL_NO_TRACE
-# endif
-# ifndef OPENSSL_NO_UBSAN
-#  define OPENSSL_NO_UBSAN
-# endif
-# ifndef OPENSSL_NO_UNIT_TEST
-#  define OPENSSL_NO_UNIT_TEST
-# endif
-# ifndef OPENSSL_NO_UPLINK
-#  define OPENSSL_NO_UPLINK
-# endif
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-#  define OPENSSL_NO_WEAK_SSL_CIPHERS
-# endif
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
-#  define OPENSSL_NO_DYNAMIC_ENGINE
-# endif
-
-
-/* Generate 80386 code? */
-# undef I386_ONLY
-
-/*
- * The following are cipher-specific, but are part of the public API.
- */
-# if !defined(OPENSSL_SYS_UEFI)
-#  undef BN_LLONG
-/* Only one for the following should be defined */
-#  define SIXTY_FOUR_BIT_LONG
-#  undef SIXTY_FOUR_BIT
-#  undef THIRTY_TWO_BIT
-# endif
-
-# define RC4_INT unsigned int
-
-# ifdef  __cplusplus
-}
-# endif
-
-#endif                          /* OPENSSL_CONFIGURATION_H */
@@ -1,227 +0,0 @@
-/*-
- * WARNING: do not edit!
- * Generated by Makefile from include/openssl/crmf.h.in
- *
- * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
- * Copyright Nokia 2007-2019
- * Copyright Siemens AG 2015-2019
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- *
- * CRMF (RFC 4211) implementation by M. Peylo, M. Viljanen, and D. von Oheimb.
- */
-
-
-
-#ifndef OPENSSL_CRMF_H
-# define OPENSSL_CRMF_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_CRMF
-#  include <openssl/opensslv.h>
-#  include <openssl/safestack.h>
-#  include <openssl/crmferr.h>
-#  include <openssl/x509v3.h> /* for GENERAL_NAME etc. */
-
-/* explicit #includes not strictly needed since implied by the above: */
-#  include <openssl/types.h>
-#  include <openssl/x509.h>
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif
-
-#  define OSSL_CRMF_POPOPRIVKEY_THISMESSAGE          0
-#  define OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE    1
-#  define OSSL_CRMF_POPOPRIVKEY_DHMAC                2
-#  define OSSL_CRMF_POPOPRIVKEY_AGREEMAC             3
-#  define OSSL_CRMF_POPOPRIVKEY_ENCRYPTEDKEY         4
-
-#  define OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT       0
-#  define OSSL_CRMF_SUBSEQUENTMESSAGE_CHALLENGERESP  1
-
-typedef struct ossl_crmf_encryptedvalue_st OSSL_CRMF_ENCRYPTEDVALUE;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_ENCRYPTEDVALUE)
-typedef struct ossl_crmf_msg_st OSSL_CRMF_MSG;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_MSG)
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_MSG)
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CRMF_MSG, OSSL_CRMF_MSG, OSSL_CRMF_MSG)
-#define sk_OSSL_CRMF_MSG_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CRMF_MSG_sk_type(sk))
-#define sk_OSSL_CRMF_MSG_value(sk, idx) ((OSSL_CRMF_MSG *)OPENSSL_sk_value(ossl_check_const_OSSL_CRMF_MSG_sk_type(sk), (idx)))
-#define sk_OSSL_CRMF_MSG_new(cmp) ((STACK_OF(OSSL_CRMF_MSG) *)OPENSSL_sk_new(ossl_check_OSSL_CRMF_MSG_compfunc_type(cmp)))
-#define sk_OSSL_CRMF_MSG_new_null() ((STACK_OF(OSSL_CRMF_MSG) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CRMF_MSG_new_reserve(cmp, n) ((STACK_OF(OSSL_CRMF_MSG) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CRMF_MSG_compfunc_type(cmp), (n)))
-#define sk_OSSL_CRMF_MSG_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CRMF_MSG_sk_type(sk), (n))
-#define sk_OSSL_CRMF_MSG_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CRMF_MSG_sk_type(sk))
-#define sk_OSSL_CRMF_MSG_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CRMF_MSG_sk_type(sk))
-#define sk_OSSL_CRMF_MSG_delete(sk, i) ((OSSL_CRMF_MSG *)OPENSSL_sk_delete(ossl_check_OSSL_CRMF_MSG_sk_type(sk), (i)))
-#define sk_OSSL_CRMF_MSG_delete_ptr(sk, ptr) ((OSSL_CRMF_MSG *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr)))
-#define sk_OSSL_CRMF_MSG_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr))
-#define sk_OSSL_CRMF_MSG_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr))
-#define sk_OSSL_CRMF_MSG_pop(sk) ((OSSL_CRMF_MSG *)OPENSSL_sk_pop(ossl_check_OSSL_CRMF_MSG_sk_type(sk)))
-#define sk_OSSL_CRMF_MSG_shift(sk) ((OSSL_CRMF_MSG *)OPENSSL_sk_shift(ossl_check_OSSL_CRMF_MSG_sk_type(sk)))
-#define sk_OSSL_CRMF_MSG_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CRMF_MSG_sk_type(sk),ossl_check_OSSL_CRMF_MSG_freefunc_type(freefunc))
-#define sk_OSSL_CRMF_MSG_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr), (idx))
-#define sk_OSSL_CRMF_MSG_set(sk, idx, ptr) ((OSSL_CRMF_MSG *)OPENSSL_sk_set(ossl_check_OSSL_CRMF_MSG_sk_type(sk), (idx), ossl_check_OSSL_CRMF_MSG_type(ptr)))
-#define sk_OSSL_CRMF_MSG_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr))
-#define sk_OSSL_CRMF_MSG_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr))
-#define sk_OSSL_CRMF_MSG_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_type(ptr), pnum)
-#define sk_OSSL_CRMF_MSG_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CRMF_MSG_sk_type(sk))
-#define sk_OSSL_CRMF_MSG_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CRMF_MSG_sk_type(sk))
-#define sk_OSSL_CRMF_MSG_dup(sk) ((STACK_OF(OSSL_CRMF_MSG) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CRMF_MSG_sk_type(sk)))
-#define sk_OSSL_CRMF_MSG_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CRMF_MSG) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_copyfunc_type(copyfunc), ossl_check_OSSL_CRMF_MSG_freefunc_type(freefunc)))
-#define sk_OSSL_CRMF_MSG_set_cmp_func(sk, cmp) ((sk_OSSL_CRMF_MSG_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CRMF_MSG_sk_type(sk), ossl_check_OSSL_CRMF_MSG_compfunc_type(cmp)))
-
-typedef struct ossl_crmf_attributetypeandvalue_st OSSL_CRMF_ATTRIBUTETYPEANDVALUE;
-typedef struct ossl_crmf_pbmparameter_st OSSL_CRMF_PBMPARAMETER;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PBMPARAMETER)
-typedef struct ossl_crmf_poposigningkey_st OSSL_CRMF_POPOSIGNINGKEY;
-typedef struct ossl_crmf_certrequest_st OSSL_CRMF_CERTREQUEST;
-typedef struct ossl_crmf_certid_st OSSL_CRMF_CERTID;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_CERTID)
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTID)
-SKM_DEFINE_STACK_OF_INTERNAL(OSSL_CRMF_CERTID, OSSL_CRMF_CERTID, OSSL_CRMF_CERTID)
-#define sk_OSSL_CRMF_CERTID_num(sk) OPENSSL_sk_num(ossl_check_const_OSSL_CRMF_CERTID_sk_type(sk))
-#define sk_OSSL_CRMF_CERTID_value(sk, idx) ((OSSL_CRMF_CERTID *)OPENSSL_sk_value(ossl_check_const_OSSL_CRMF_CERTID_sk_type(sk), (idx)))
-#define sk_OSSL_CRMF_CERTID_new(cmp) ((STACK_OF(OSSL_CRMF_CERTID) *)OPENSSL_sk_new(ossl_check_OSSL_CRMF_CERTID_compfunc_type(cmp)))
-#define sk_OSSL_CRMF_CERTID_new_null() ((STACK_OF(OSSL_CRMF_CERTID) *)OPENSSL_sk_new_null())
-#define sk_OSSL_CRMF_CERTID_new_reserve(cmp, n) ((STACK_OF(OSSL_CRMF_CERTID) *)OPENSSL_sk_new_reserve(ossl_check_OSSL_CRMF_CERTID_compfunc_type(cmp), (n)))
-#define sk_OSSL_CRMF_CERTID_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), (n))
-#define sk_OSSL_CRMF_CERTID_free(sk) OPENSSL_sk_free(ossl_check_OSSL_CRMF_CERTID_sk_type(sk))
-#define sk_OSSL_CRMF_CERTID_zero(sk) OPENSSL_sk_zero(ossl_check_OSSL_CRMF_CERTID_sk_type(sk))
-#define sk_OSSL_CRMF_CERTID_delete(sk, i) ((OSSL_CRMF_CERTID *)OPENSSL_sk_delete(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), (i)))
-#define sk_OSSL_CRMF_CERTID_delete_ptr(sk, ptr) ((OSSL_CRMF_CERTID *)OPENSSL_sk_delete_ptr(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr)))
-#define sk_OSSL_CRMF_CERTID_push(sk, ptr) OPENSSL_sk_push(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr))
-#define sk_OSSL_CRMF_CERTID_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr))
-#define sk_OSSL_CRMF_CERTID_pop(sk) ((OSSL_CRMF_CERTID *)OPENSSL_sk_pop(ossl_check_OSSL_CRMF_CERTID_sk_type(sk)))
-#define sk_OSSL_CRMF_CERTID_shift(sk) ((OSSL_CRMF_CERTID *)OPENSSL_sk_shift(ossl_check_OSSL_CRMF_CERTID_sk_type(sk)))
-#define sk_OSSL_CRMF_CERTID_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_OSSL_CRMF_CERTID_sk_type(sk),ossl_check_OSSL_CRMF_CERTID_freefunc_type(freefunc))
-#define sk_OSSL_CRMF_CERTID_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr), (idx))
-#define sk_OSSL_CRMF_CERTID_set(sk, idx, ptr) ((OSSL_CRMF_CERTID *)OPENSSL_sk_set(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), (idx), ossl_check_OSSL_CRMF_CERTID_type(ptr)))
-#define sk_OSSL_CRMF_CERTID_find(sk, ptr) OPENSSL_sk_find(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr))
-#define sk_OSSL_CRMF_CERTID_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr))
-#define sk_OSSL_CRMF_CERTID_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_type(ptr), pnum)
-#define sk_OSSL_CRMF_CERTID_sort(sk) OPENSSL_sk_sort(ossl_check_OSSL_CRMF_CERTID_sk_type(sk))
-#define sk_OSSL_CRMF_CERTID_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_OSSL_CRMF_CERTID_sk_type(sk))
-#define sk_OSSL_CRMF_CERTID_dup(sk) ((STACK_OF(OSSL_CRMF_CERTID) *)OPENSSL_sk_dup(ossl_check_const_OSSL_CRMF_CERTID_sk_type(sk)))
-#define sk_OSSL_CRMF_CERTID_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(OSSL_CRMF_CERTID) *)OPENSSL_sk_deep_copy(ossl_check_const_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_copyfunc_type(copyfunc), ossl_check_OSSL_CRMF_CERTID_freefunc_type(freefunc)))
-#define sk_OSSL_CRMF_CERTID_set_cmp_func(sk, cmp) ((sk_OSSL_CRMF_CERTID_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_OSSL_CRMF_CERTID_sk_type(sk), ossl_check_OSSL_CRMF_CERTID_compfunc_type(cmp)))
-
-
-typedef struct ossl_crmf_pkipublicationinfo_st OSSL_CRMF_PKIPUBLICATIONINFO;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PKIPUBLICATIONINFO)
-typedef struct ossl_crmf_singlepubinfo_st OSSL_CRMF_SINGLEPUBINFO;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_SINGLEPUBINFO)
-typedef struct ossl_crmf_certtemplate_st OSSL_CRMF_CERTTEMPLATE;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_CERTTEMPLATE)
-typedef STACK_OF(OSSL_CRMF_MSG) OSSL_CRMF_MSGS;
-DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_MSGS)
-
-typedef struct ossl_crmf_optionalvalidity_st OSSL_CRMF_OPTIONALVALIDITY;
-
-/* crmf_pbm.c */
-OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
-                                           int owfnid, size_t itercnt,
-                                           int macnid);
-int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
-                      const OSSL_CRMF_PBMPARAMETER *pbmp,
-                      const unsigned char *msg, size_t msglen,
-                      const unsigned char *sec, size_t seclen,
-                      unsigned char **mac, size_t *maclen);
-
-/* crmf_lib.c */
-int OSSL_CRMF_MSG_set1_regCtrl_regToken(OSSL_CRMF_MSG *msg,
-                                        const ASN1_UTF8STRING *tok);
-ASN1_UTF8STRING
-*OSSL_CRMF_MSG_get0_regCtrl_regToken(const OSSL_CRMF_MSG *msg);
-int OSSL_CRMF_MSG_set1_regCtrl_authenticator(OSSL_CRMF_MSG *msg,
-                                             const ASN1_UTF8STRING *auth);
-ASN1_UTF8STRING
-*OSSL_CRMF_MSG_get0_regCtrl_authenticator(const OSSL_CRMF_MSG *msg);
-int
-OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
-                                                     OSSL_CRMF_SINGLEPUBINFO *spi);
-#  define OSSL_CRMF_PUB_METHOD_DONTCARE 0
-#  define OSSL_CRMF_PUB_METHOD_X500     1
-#  define OSSL_CRMF_PUB_METHOD_WEB      2
-#  define OSSL_CRMF_PUB_METHOD_LDAP     3
-int OSSL_CRMF_MSG_set0_SinglePubInfo(OSSL_CRMF_SINGLEPUBINFO *spi,
-                                     int method, GENERAL_NAME *nm);
-#  define OSSL_CRMF_PUB_ACTION_DONTPUBLISH   0
-#  define OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH 1
-int OSSL_CRMF_MSG_set_PKIPublicationInfo_action(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
-                                                int action);
-int OSSL_CRMF_MSG_set1_regCtrl_pkiPublicationInfo(OSSL_CRMF_MSG *msg,
-                                                  const OSSL_CRMF_PKIPUBLICATIONINFO *pi);
-OSSL_CRMF_PKIPUBLICATIONINFO
-*OSSL_CRMF_MSG_get0_regCtrl_pkiPublicationInfo(const OSSL_CRMF_MSG *msg);
-int OSSL_CRMF_MSG_set1_regCtrl_protocolEncrKey(OSSL_CRMF_MSG *msg,
-                                               const X509_PUBKEY *pubkey);
-X509_PUBKEY
-*OSSL_CRMF_MSG_get0_regCtrl_protocolEncrKey(const OSSL_CRMF_MSG *msg);
-int OSSL_CRMF_MSG_set1_regCtrl_oldCertID(OSSL_CRMF_MSG *msg,
-                                         const OSSL_CRMF_CERTID *cid);
-OSSL_CRMF_CERTID
-*OSSL_CRMF_MSG_get0_regCtrl_oldCertID(const OSSL_CRMF_MSG *msg);
-OSSL_CRMF_CERTID *OSSL_CRMF_CERTID_gen(const X509_NAME *issuer,
-                                       const ASN1_INTEGER *serial);
-
-int OSSL_CRMF_MSG_set1_regInfo_utf8Pairs(OSSL_CRMF_MSG *msg,
-                                         const ASN1_UTF8STRING *utf8pairs);
-ASN1_UTF8STRING
-*OSSL_CRMF_MSG_get0_regInfo_utf8Pairs(const OSSL_CRMF_MSG *msg);
-int OSSL_CRMF_MSG_set1_regInfo_certReq(OSSL_CRMF_MSG *msg,
-                                       const OSSL_CRMF_CERTREQUEST *cr);
-OSSL_CRMF_CERTREQUEST
-*OSSL_CRMF_MSG_get0_regInfo_certReq(const OSSL_CRMF_MSG *msg);
-
-int OSSL_CRMF_MSG_set0_validity(OSSL_CRMF_MSG *crm,
-                                ASN1_TIME *notBefore, ASN1_TIME *notAfter);
-int OSSL_CRMF_MSG_set_certReqId(OSSL_CRMF_MSG *crm, int rid);
-int OSSL_CRMF_MSG_get_certReqId(const OSSL_CRMF_MSG *crm);
-int OSSL_CRMF_MSG_set0_extensions(OSSL_CRMF_MSG *crm, X509_EXTENSIONS *exts);
-
-int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm, X509_EXTENSION *ext);
-#  define OSSL_CRMF_POPO_NONE       -1
-#  define OSSL_CRMF_POPO_RAVERIFIED 0
-#  define OSSL_CRMF_POPO_SIGNATURE  1
-#  define OSSL_CRMF_POPO_KEYENC     2
-#  define OSSL_CRMF_POPO_KEYAGREE   3
-int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
-                              EVP_PKEY *pkey, const EVP_MD *digest,
-                              OSSL_LIB_CTX *libctx, const char *propq);
-int OSSL_CRMF_MSGS_verify_popo(const OSSL_CRMF_MSGS *reqs,
-                               int rid, int acceptRAVerified,
-                               OSSL_LIB_CTX *libctx, const char *propq);
-OSSL_CRMF_CERTTEMPLATE *OSSL_CRMF_MSG_get0_tmpl(const OSSL_CRMF_MSG *crm);
-const ASN1_INTEGER
-*OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-X509_EXTENSIONS
-*OSSL_CRMF_CERTTEMPLATE_get0_extensions(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const X509_NAME
-*OSSL_CRMF_CERTID_get0_issuer(const OSSL_CRMF_CERTID *cid);
-const ASN1_INTEGER
-*OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID *cid);
-int OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_CERTTEMPLATE *tmpl,
-                                EVP_PKEY *pubkey,
-                                const X509_NAME *subject,
-                                const X509_NAME *issuer,
-                                const ASN1_INTEGER *serial);
-X509
-*OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(const OSSL_CRMF_ENCRYPTEDVALUE *ecert,
-                                       OSSL_LIB_CTX *libctx, const char *propq,
-                                       EVP_PKEY *pkey);
-
-#  ifdef __cplusplus
-}
-#  endif
-# endif /* !defined(OPENSSL_NO_CRMF) */
-#endif /* !defined(OPENSSL_CRMF_H) */
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
@@ -279,8 +279,7 @@ typedef unsigned __int64 uint64_t;
 #  define ossl_inline inline
 # endif

-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
-     !defined(__cplusplus) 
+# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
 #  define ossl_noreturn _Noreturn
 # elif defined(__GNUC__) && __GNUC__ >= 2
 #  define ossl_noreturn __attribute__((noreturn))
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2020 The OpenSSL Project Authors. All Rights Reserved.
 * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
@@ -793,15 +793,12 @@ int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
 EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
 int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);

-# define d2i_ECPKParameters_bio(bp,x) \
-    ASN1_d2i_bio_of(EC_GROUP, NULL, d2i_ECPKParameters, bp, x)
-# define i2d_ECPKParameters_bio(bp,x) \
-    ASN1_i2d_bio_of_const(EC_GROUP, i2d_ECPKParameters, bp, x)
-# define d2i_ECPKParameters_fp(fp,x) \
-    (EC_GROUP *)ASN1_d2i_fp(NULL, (d2i_of_void *)d2i_ECPKParameters, (fp), \
-                            (void **)(x))
-# define i2d_ECPKParameters_fp(fp,x) \
-    ASN1_i2d_fp((i2d_of_void *)i2d_ECPKParameters, (fp), (void *)(x))
+# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
+# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
+# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
+                (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
+# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
+                (unsigned char *)(x))

 int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
 # ifndef OPENSSL_NO_STDIO
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
 * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
@@ -722,7 +722,6 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
            CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
                                     fns->mem_fns.realloc_fn, \
                                     fns->mem_fns.free_fn); \
-            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
        skip_cbs: \
            if (!fn(e, id)) return 0; \
            return 1; }
@@ -1,128 +0,0 @@
-/*
- * WARNING: do not edit!
- * Generated by Makefile from include/openssl/ess.h.in
- *
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-
-
-#ifndef OPENSSL_ESS_H
-# define OPENSSL_ESS_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-
-# include <openssl/safestack.h>
-# include <openssl/x509.h>
-# include <openssl/esserr.h>
-
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-
-typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
-typedef struct ESS_cert_id ESS_CERT_ID;
-typedef struct ESS_signing_cert ESS_SIGNING_CERT;
-
-SKM_DEFINE_STACK_OF_INTERNAL(ESS_CERT_ID, ESS_CERT_ID, ESS_CERT_ID)
-#define sk_ESS_CERT_ID_num(sk) OPENSSL_sk_num(ossl_check_const_ESS_CERT_ID_sk_type(sk))
-#define sk_ESS_CERT_ID_value(sk, idx) ((ESS_CERT_ID *)OPENSSL_sk_value(ossl_check_const_ESS_CERT_ID_sk_type(sk), (idx)))
-#define sk_ESS_CERT_ID_new(cmp) ((STACK_OF(ESS_CERT_ID) *)OPENSSL_sk_new(ossl_check_ESS_CERT_ID_compfunc_type(cmp)))
-#define sk_ESS_CERT_ID_new_null() ((STACK_OF(ESS_CERT_ID) *)OPENSSL_sk_new_null())
-#define sk_ESS_CERT_ID_new_reserve(cmp, n) ((STACK_OF(ESS_CERT_ID) *)OPENSSL_sk_new_reserve(ossl_check_ESS_CERT_ID_compfunc_type(cmp), (n)))
-#define sk_ESS_CERT_ID_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_ESS_CERT_ID_sk_type(sk), (n))
-#define sk_ESS_CERT_ID_free(sk) OPENSSL_sk_free(ossl_check_ESS_CERT_ID_sk_type(sk))
-#define sk_ESS_CERT_ID_zero(sk) OPENSSL_sk_zero(ossl_check_ESS_CERT_ID_sk_type(sk))
-#define sk_ESS_CERT_ID_delete(sk, i) ((ESS_CERT_ID *)OPENSSL_sk_delete(ossl_check_ESS_CERT_ID_sk_type(sk), (i)))
-#define sk_ESS_CERT_ID_delete_ptr(sk, ptr) ((ESS_CERT_ID *)OPENSSL_sk_delete_ptr(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr)))
-#define sk_ESS_CERT_ID_push(sk, ptr) OPENSSL_sk_push(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr))
-#define sk_ESS_CERT_ID_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr))
-#define sk_ESS_CERT_ID_pop(sk) ((ESS_CERT_ID *)OPENSSL_sk_pop(ossl_check_ESS_CERT_ID_sk_type(sk)))
-#define sk_ESS_CERT_ID_shift(sk) ((ESS_CERT_ID *)OPENSSL_sk_shift(ossl_check_ESS_CERT_ID_sk_type(sk)))
-#define sk_ESS_CERT_ID_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_ESS_CERT_ID_sk_type(sk),ossl_check_ESS_CERT_ID_freefunc_type(freefunc))
-#define sk_ESS_CERT_ID_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr), (idx))
-#define sk_ESS_CERT_ID_set(sk, idx, ptr) ((ESS_CERT_ID *)OPENSSL_sk_set(ossl_check_ESS_CERT_ID_sk_type(sk), (idx), ossl_check_ESS_CERT_ID_type(ptr)))
-#define sk_ESS_CERT_ID_find(sk, ptr) OPENSSL_sk_find(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr))
-#define sk_ESS_CERT_ID_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr))
-#define sk_ESS_CERT_ID_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_type(ptr), pnum)
-#define sk_ESS_CERT_ID_sort(sk) OPENSSL_sk_sort(ossl_check_ESS_CERT_ID_sk_type(sk))
-#define sk_ESS_CERT_ID_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_ESS_CERT_ID_sk_type(sk))
-#define sk_ESS_CERT_ID_dup(sk) ((STACK_OF(ESS_CERT_ID) *)OPENSSL_sk_dup(ossl_check_const_ESS_CERT_ID_sk_type(sk)))
-#define sk_ESS_CERT_ID_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(ESS_CERT_ID) *)OPENSSL_sk_deep_copy(ossl_check_const_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_copyfunc_type(copyfunc), ossl_check_ESS_CERT_ID_freefunc_type(freefunc)))
-#define sk_ESS_CERT_ID_set_cmp_func(sk, cmp) ((sk_ESS_CERT_ID_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_ESS_CERT_ID_sk_type(sk), ossl_check_ESS_CERT_ID_compfunc_type(cmp)))
-
-
-
-typedef struct ESS_signing_cert_v2_st ESS_SIGNING_CERT_V2;
-typedef struct ESS_cert_id_v2_st ESS_CERT_ID_V2;
-
-SKM_DEFINE_STACK_OF_INTERNAL(ESS_CERT_ID_V2, ESS_CERT_ID_V2, ESS_CERT_ID_V2)
-#define sk_ESS_CERT_ID_V2_num(sk) OPENSSL_sk_num(ossl_check_const_ESS_CERT_ID_V2_sk_type(sk))
-#define sk_ESS_CERT_ID_V2_value(sk, idx) ((ESS_CERT_ID_V2 *)OPENSSL_sk_value(ossl_check_const_ESS_CERT_ID_V2_sk_type(sk), (idx)))
-#define sk_ESS_CERT_ID_V2_new(cmp) ((STACK_OF(ESS_CERT_ID_V2) *)OPENSSL_sk_new(ossl_check_ESS_CERT_ID_V2_compfunc_type(cmp)))
-#define sk_ESS_CERT_ID_V2_new_null() ((STACK_OF(ESS_CERT_ID_V2) *)OPENSSL_sk_new_null())
-#define sk_ESS_CERT_ID_V2_new_reserve(cmp, n) ((STACK_OF(ESS_CERT_ID_V2) *)OPENSSL_sk_new_reserve(ossl_check_ESS_CERT_ID_V2_compfunc_type(cmp), (n)))
-#define sk_ESS_CERT_ID_V2_reserve(sk, n) OPENSSL_sk_reserve(ossl_check_ESS_CERT_ID_V2_sk_type(sk), (n))
-#define sk_ESS_CERT_ID_V2_free(sk) OPENSSL_sk_free(ossl_check_ESS_CERT_ID_V2_sk_type(sk))
-#define sk_ESS_CERT_ID_V2_zero(sk) OPENSSL_sk_zero(ossl_check_ESS_CERT_ID_V2_sk_type(sk))
-#define sk_ESS_CERT_ID_V2_delete(sk, i) ((ESS_CERT_ID_V2 *)OPENSSL_sk_delete(ossl_check_ESS_CERT_ID_V2_sk_type(sk), (i)))
-#define sk_ESS_CERT_ID_V2_delete_ptr(sk, ptr) ((ESS_CERT_ID_V2 *)OPENSSL_sk_delete_ptr(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr)))
-#define sk_ESS_CERT_ID_V2_push(sk, ptr) OPENSSL_sk_push(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr))
-#define sk_ESS_CERT_ID_V2_unshift(sk, ptr) OPENSSL_sk_unshift(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr))
-#define sk_ESS_CERT_ID_V2_pop(sk) ((ESS_CERT_ID_V2 *)OPENSSL_sk_pop(ossl_check_ESS_CERT_ID_V2_sk_type(sk)))
-#define sk_ESS_CERT_ID_V2_shift(sk) ((ESS_CERT_ID_V2 *)OPENSSL_sk_shift(ossl_check_ESS_CERT_ID_V2_sk_type(sk)))
-#define sk_ESS_CERT_ID_V2_pop_free(sk, freefunc) OPENSSL_sk_pop_free(ossl_check_ESS_CERT_ID_V2_sk_type(sk),ossl_check_ESS_CERT_ID_V2_freefunc_type(freefunc))
-#define sk_ESS_CERT_ID_V2_insert(sk, ptr, idx) OPENSSL_sk_insert(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr), (idx))
-#define sk_ESS_CERT_ID_V2_set(sk, idx, ptr) ((ESS_CERT_ID_V2 *)OPENSSL_sk_set(ossl_check_ESS_CERT_ID_V2_sk_type(sk), (idx), ossl_check_ESS_CERT_ID_V2_type(ptr)))
-#define sk_ESS_CERT_ID_V2_find(sk, ptr) OPENSSL_sk_find(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr))
-#define sk_ESS_CERT_ID_V2_find_ex(sk, ptr) OPENSSL_sk_find_ex(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr))
-#define sk_ESS_CERT_ID_V2_find_all(sk, ptr, pnum) OPENSSL_sk_find_all(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_type(ptr), pnum)
-#define sk_ESS_CERT_ID_V2_sort(sk) OPENSSL_sk_sort(ossl_check_ESS_CERT_ID_V2_sk_type(sk))
-#define sk_ESS_CERT_ID_V2_is_sorted(sk) OPENSSL_sk_is_sorted(ossl_check_const_ESS_CERT_ID_V2_sk_type(sk))
-#define sk_ESS_CERT_ID_V2_dup(sk) ((STACK_OF(ESS_CERT_ID_V2) *)OPENSSL_sk_dup(ossl_check_const_ESS_CERT_ID_V2_sk_type(sk)))
-#define sk_ESS_CERT_ID_V2_deep_copy(sk, copyfunc, freefunc) ((STACK_OF(ESS_CERT_ID_V2) *)OPENSSL_sk_deep_copy(ossl_check_const_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_copyfunc_type(copyfunc), ossl_check_ESS_CERT_ID_V2_freefunc_type(freefunc)))
-#define sk_ESS_CERT_ID_V2_set_cmp_func(sk, cmp) ((sk_ESS_CERT_ID_V2_compfunc)OPENSSL_sk_set_cmp_func(ossl_check_ESS_CERT_ID_V2_sk_type(sk), ossl_check_ESS_CERT_ID_V2_compfunc_type(cmp)))
-
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_ISSUER_SERIAL)
-DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_ISSUER_SERIAL, ESS_ISSUER_SERIAL)
-DECLARE_ASN1_DUP_FUNCTION(ESS_ISSUER_SERIAL)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_CERT_ID)
-DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_CERT_ID, ESS_CERT_ID)
-DECLARE_ASN1_DUP_FUNCTION(ESS_CERT_ID)
-
-DECLARE_ASN1_FUNCTIONS(ESS_SIGNING_CERT)
-DECLARE_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_CERT_ID_V2)
-DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_CERT_ID_V2, ESS_CERT_ID_V2)
-DECLARE_ASN1_DUP_FUNCTION(ESS_CERT_ID_V2)
-
-DECLARE_ASN1_FUNCTIONS(ESS_SIGNING_CERT_V2)
-DECLARE_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT_V2)
-
-ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert,
-                                                 const STACK_OF(X509) *certs,
-                                                 int set_issuer_serial);
-ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg,
-                                                       const X509 *signcert,
-                                                       const
-                                                       STACK_OF(X509) *certs,
-                                                       int set_issuer_serial);
-int OSSL_ESS_check_signing_certs(const ESS_SIGNING_CERT *ss,
-                                 const ESS_SIGNING_CERT_V2 *ssv2,
-                                 const STACK_OF(X509) *chain,
-                                 int require_signing_cert);
-
-# ifdef  __cplusplus
-}
-# endif
-#endif
@@ -1,36 +0,0 @@
-/*
- * WARNING: do not edit!
- * Generated by Makefile from include/openssl/fipskey.h.in
- *
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#ifndef OPENSSL_FIPSKEY_H
-# define OPENSSL_FIPSKEY_H
-# pragma once
-
-# ifdef  __cplusplus
-extern "C" {
-# endif
-
-/*
- * The FIPS validation HMAC key, usable as an array initializer.
- */
-#define FIPS_KEY_ELEMENTS \
-    0xf4, 0x55, 0x66, 0x50, 0xac, 0x31, 0xd3, 0x54, 0x61, 0x61, 0x0b, 0xac, 0x4e, 0xd8, 0x1b, 0x1a, 0x18, 0x1b, 0x2d, 0x8a, 0x43, 0xea, 0x28, 0x54, 0xcb, 0xae, 0x22, 0xca, 0x74, 0x56, 0x08, 0x13
-
-/*
- * The FIPS validation key, as a string.
- */
-#define FIPS_KEY_STRING "f4556650ac31d35461610bac4ed81b1a181b2d8a43ea2854cbae22ca74560813"
-
-# ifdef  __cplusplus
-}
-# endif
-
-#endif
@@ -2,7 +2,7 @@
 * WARNING: do not edit!
 * Generated by crypto/objects/objects.pl
 *
- * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
 * Licensed under the OpenSSL license (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
 * in the file LICENSE in the source distribution or at
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
@@ -39,8 +39,8 @@ extern "C" {
 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
 *  major minor fix final patch/beta)
 */
-# define OPENSSL_VERSION_NUMBER  0x1010111fL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1q  5 Jul 2022"
+# define OPENSSL_VERSION_NUMBER  0x101010bfL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1k  25 Mar 2021"

 /*-
 * The macros below are to be used for shared library (.so, .dll, ...)
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
 * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
 * Copyright 2005 Nokia. All rights reserved.
 *
@@ -1305,8 +1305,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 # define SSL_CTRL_GET_MAX_PROTO_VERSION          131
 # define SSL_CTRL_GET_SIGNATURE_NID              132
 # define SSL_CTRL_GET_TMP_KEY                    133
-# define SSL_CTRL_GET_VERIFY_CERT_STORE          137
-# define SSL_CTRL_GET_CHAIN_CERT_STORE           138
 # define SSL_CERT_SET_FIRST                      1
 # define SSL_CERT_SET_NEXT                       2
 # define SSL_CERT_SET_SERVER                     3
@@ -1362,14 +1360,10 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
 # define SSL_CTX_set1_verify_cert_store(ctx,st) \
        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
-# define SSL_CTX_get0_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
 # define SSL_CTX_set0_chain_cert_store(ctx,st) \
        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
 # define SSL_CTX_set1_chain_cert_store(ctx,st) \
        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
-# define SSL_CTX_get0_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
 # define SSL_set0_chain(s,sk) \
        SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
 # define SSL_set1_chain(s,sk) \
@@ -1392,14 +1386,10 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
 # define SSL_set1_verify_cert_store(s,st) \
        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
-#define SSL_get0_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
 # define SSL_set0_chain_cert_store(s,st) \
        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
 # define SSL_set1_chain_cert_store(s,st) \
        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
-#define SSL_get0_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
 # define SSL_get1_groups(s, glist) \
        SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
 # define SSL_CTX_set1_groups(ctx, glist, glistlen) \
@@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
@@ -70,7 +70,6 @@ int ERR_load_SSL_strings(void);
 # define SSL_F_FINAL_EMS                                  486
 # define SSL_F_FINAL_KEY_SHARE                            503
 # define SSL_F_FINAL_MAXFRAGMENTLEN                       557
-# define SSL_F_FINAL_PSK                                  639
 # define SSL_F_FINAL_RENEGOTIATE                          483
 # define SSL_F_FINAL_SERVER_NAME                          558
 # define SSL_F_FINAL_SIG_ALGS                             497
@@ -593,7 +592,6 @@ int ERR_load_SSL_strings(void);
 # define SSL_R_MISSING_ECDSA_SIGNING_CERT                 381
 # define SSL_R_MISSING_FATAL                              256
 # define SSL_R_MISSING_PARAMETERS                         290
-# define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION            310
 # define SSL_R_MISSING_RSA_CERTIFICATE                    168
 # define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
 # define SSL_R_MISSING_RSA_SIGNING_CERT                   170
@@ -635,7 +633,6 @@ int ERR_load_SSL_strings(void);
 # define SSL_R_NO_VERIFY_COOKIE_CALLBACK                  403
 # define SSL_R_NULL_SSL_CTX                               195
 # define SSL_R_NULL_SSL_METHOD_PASSED                     196
-# define SSL_R_OCSP_CALLBACK_FAILURE                      294
 # define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
 # define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
 # define SSL_R_OVERFLOW_ERROR                             237
@@ -1,6 +1,6 @@
 /*
 * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
 * this file except in compliance with the License.  You can obtain a copy
@@ -38,7 +38,6 @@ int ERR_load_X509V3_strings(void);
 # define X509V3_F_I2S_ASN1_IA5STRING                      149
 # define X509V3_F_I2S_ASN1_INTEGER                        120
 # define X509V3_F_I2V_AUTHORITY_INFO_ACCESS               138
-# define X509V3_F_I2V_AUTHORITY_KEYID                     173
 # define X509V3_F_LEVEL_ADD_NODE                          168
 # define X509V3_F_NOTICE_SECTION                          132
 # define X509V3_F_NREF_NOS                                133
@@ -79,7 +78,6 @@ int ERR_load_X509V3_strings(void);
 # define X509V3_F_V2I_TLS_FEATURE                         165
 # define X509V3_F_V3_GENERIC_EXTENSION                    116
 # define X509V3_F_X509V3_ADD1_I2D                         140
-# define X509V3_F_X509V3_ADD_LEN_VALUE                    174
 # define X509V3_F_X509V3_ADD_VALUE                        105
 # define X509V3_F_X509V3_EXT_ADD                          104
 # define X509V3_F_X509V3_EXT_ADD_ALIAS                    106
@@ -17,12 +17,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_sendMousePosition(JNIEnv *env, jclass
    LiSendMousePositionEvent(x, y, referenceWidth, referenceHeight);
 }

-JNIEXPORT void JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_sendMouseMoveAsMousePosition(JNIEnv *env, jclass clazz,
-        jshort deltaX, jshort deltaY, jshort referenceWidth, jshort referenceHeight) {
-    LiSendMouseMoveAsMousePositionEvent(deltaX, deltaY, referenceWidth, referenceHeight);
-}
-
 JNIEXPORT void JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_sendMouseButton(JNIEnv *env, jclass clazz, jbyte buttonEvent, jbyte mouseButton) {
    LiSendMouseButtonEvent(buttonEvent, mouseButton);
@@ -47,8 +41,13 @@ Java_com_limelight_nvstream_jni_MoonBridge_sendControllerInput(JNIEnv *env, jcla
 }

 JNIEXPORT void JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_sendKeyboardInput(JNIEnv *env, jclass clazz, jshort keyCode, jbyte keyAction, jbyte modifiers, jbyte flags) {
-    LiSendKeyboardEvent2(keyCode, keyAction, modifiers, flags);
+Java_com_limelight_nvstream_jni_MoonBridge_sendKeyboardInput(JNIEnv *env, jclass clazz, jshort keyCode, jbyte keyAction, jbyte modifiers) {
+    LiSendKeyboardEvent(keyCode, keyAction, modifiers);
+}
+
+JNIEXPORT void JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_sendMouseScroll(JNIEnv *env, jclass clazz, jbyte scrollClicks) {
+    LiSendScrollEvent(scrollClicks);
 }

 JNIEXPORT void JNICALL
@@ -56,11 +55,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_sendMouseHighResScroll(JNIEnv *env, j
    LiSendHighResScrollEvent(scrollAmount);
 }

-JNIEXPORT void JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_sendMouseHighResHScroll(JNIEnv *env, jclass clazz, jshort scrollAmount) {
-    LiSendHighResHScrollEvent(scrollAmount);
-}
-
 JNIEXPORT void JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_sendUtf8Text(JNIEnv *env, jclass clazz, jstring text) {
    const char* utf8Text = (*env)->GetStringUTFChars(env, text, NULL);
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="256dp"
-    android:height="256dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:width="256dp"
+        android:height="256dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z" />
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"
+        android:fillColor="#FFFFFF"/>
 </vector>
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:width="512dp"
+        android:height="512dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z" />
+        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z"
+        android:fillColor="#FFFFFF"/>
 </vector>
--- a/Show More
+++ b/Show More