Version 9.8.2

Fixes #155

app/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
 
-        versionName "9.7.4"
-        versionCode = 244
+        versionName "9.8.2"
+        versionCode = 253
     }
 
     flavorDimensions "root"
@@ -114,10 +114,10 @@ android {
 }
 
 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.64'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.66'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.66'
     implementation 'org.jcodec:jcodec:0.2.3'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.10'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     implementation 'com.squareup.okio:okio:1.17.5'
     implementation 'org.jmdns:jmdns:3.5.5'
 }

app/src/main/AndroidManifest.xml

@@ -126,6 +126,15 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.AppView" />
+
+            <!-- Special metadata for NVIDIA Shield devices to prevent input buffering
+                 and most importantly, opt out of mouse acceleration while streaming -->
+            <meta-data
+                android:name="com.nvidia.immediateInput"
+                android:value="true" />
+            <meta-data
+                android:name="com.nvidia.rawCursorInput"
+                android:value="true" />
         </activity>
 
         <service

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

@@ -386,9 +386,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
-        
+
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
+
+        menu.setHeaderTitle(selectedApp.app.getAppName());
+
         if (lastRunningAppId != 0) {
             if (lastRunningAppId == selectedApp.app.getAppId()) {
                 menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));

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

@@ -630,6 +630,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // On M, we can explicitly set the optimal display mode
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             Display.Mode bestMode = display.getMode();
+            boolean isNativeResolutionStream = PreferenceConfiguration.isNativeResolution(prefConfig.width, prefConfig.height);
             boolean refreshRateIsGood = isRefreshRateGoodMatch(bestMode.getRefreshRate());
             for (Display.Mode candidate : display.getSupportedModes()) {
                 boolean refreshRateReduced = candidate.getRefreshRate() < bestMode.getRefreshRate();
@@ -641,14 +642,15 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 LimeLog.info("Examining display mode: "+candidate.getPhysicalWidth()+"x"+
                         candidate.getPhysicalHeight()+"x"+candidate.getRefreshRate());
 
-                if (candidate.getPhysicalWidth() > 4096) {
+                if (candidate.getPhysicalWidth() > 4096 && prefConfig.width <= 4096) {
                     // Avoid resolutions options above 4K to be safe
                     continue;
                 }
 
                 // On non-4K streams, we force the resolution to never change unless it's above
-                // 60 FPS, which may require a resolution reduction due to HDMI bandwidth limitations.
-                if (prefConfig.width < 3840 && prefConfig.fps <= 60) {
+                // 60 FPS, which may require a resolution reduction due to HDMI bandwidth limitations,
+                // or it's a native resolution stream.
+                if (prefConfig.width < 3840 && prefConfig.fps <= 60 && !isNativeResolutionStream) {
                     if (display.getMode().getPhysicalWidth() != candidate.getPhysicalWidth() ||
                             display.getMode().getPhysicalHeight() != candidate.getPhysicalHeight()) {
                         continue;
@@ -1549,11 +1551,16 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
 
                     String dialogText = getResources().getString(R.string.conn_error_msg) + " " + stage +" (error "+errorCode+")";
+
+                    if (portFlags != 0) {
+                        dialogText += "\n\n" + getResources().getString(R.string.check_ports_msg) + "\n" +
+                                MoonBridge.stringifyPortFlags(portFlags, "\n");
+                    }
+
                     if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0)  {
                         dialogText += "\n\n" + getResources().getString(R.string.nettest_text_blocked);
                     }
 
-
                     Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_error_title), dialogText, true);
                 }
             }
@@ -1564,8 +1571,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     public void connectionTerminated(final int errorCode) {
         // Perform a connection test if the failure could be due to a blocked port
         // This does network I/O, so don't do it on the main thread.
-        final int portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER,
-                443, MoonBridge.getPortFlagsFromTerminationErrorCode(errorCode));
+        final int portFlags = MoonBridge.getPortFlagsFromTerminationErrorCode(errorCode);
+        final int portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER,443, portFlags);
 
         runOnUiThread(new Runnable() {
             @Override
@@ -1600,12 +1607,21 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                                     message = getResources().getString(R.string.no_frame_received_error);
                                     break;
 
+                                case MoonBridge.ML_ERROR_UNEXPECTED_EARLY_TERMINATION:
+                                    message = getResources().getString(R.string.early_termination_error);
+                                    break;
+
                                 default:
                                     message = getResources().getString(R.string.conn_terminated_msg);
                                     break;
                             }
                         }
 
+                        if (portFlags != 0) {
+                            message += "\n\n" + getResources().getString(R.string.check_ports_msg) + "\n" +
+                                    MoonBridge.stringifyPortFlags(portFlags, "\n");
+                        }
+
                         Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
                                 message, true);
                     }

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

@@ -109,7 +109,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }
     }
 
-    private final static int APP_LIST_ID = 1;
     private final static int PAIR_ID = 2;
     private final static int UNPAIR_ID = 3;
     private final static int WOL_ID = 4;
@@ -318,6 +317,25 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
 
+        // Add a header with PC status details
+        menu.clearHeader();
+        String headerTitle = computer.details.name + " - ";
+        switch (computer.details.state)
+        {
+            case ONLINE:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_online);
+                break;
+            case OFFLINE:
+                menu.setHeaderIcon(R.drawable.ic_pc_offline);
+                headerTitle += getResources().getString(R.string.pcview_menu_header_offline);
+                break;
+            case UNKNOWN:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_unknown);
+                break;
+        }
+
+        menu.setHeaderTitle(headerTitle);
+
         // Inflate the context menu
         if (computer.details.state == ComputerDetails.State.OFFLINE ||
             computer.details.state == ComputerDetails.State.UNKNOWN) {
@@ -332,8 +350,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
             }
 
-            menu.add(Menu.NONE, APP_LIST_ID, 3, getResources().getString(R.string.pcview_menu_app_list));
-            menu.add(Menu.NONE, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_full_app_list));
+            menu.add(Menu.NONE, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_app_list));
         }
 
         menu.add(Menu.NONE, TEST_NETWORK_ID, 5, getResources().getString(R.string.pcview_menu_test_network));
@@ -594,8 +611,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 return true;
 
             case FULL_APP_LIST_ID:
-            case APP_LIST_ID:
-                doAppList(computer.details, false, item.getItemId() == FULL_APP_LIST_ID);
+                doAppList(computer.details, false, true);
                 return true;
 
             case RESUME_ID:

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

@@ -40,6 +40,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
     private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
 
+    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<>();
@@ -101,6 +107,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
         defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
         defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.hatXAxis = MotionEvent.AXIS_HAT_X;
+        defaultContext.hatYAxis = MotionEvent.AXIS_HAT_Y;
         defaultContext.controllerNumber = (short) 0;
         defaultContext.assignedControllerNumber = true;
         defaultContext.external = false;
@@ -188,6 +196,28 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return true;
         }
 
+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (device.getId() == -1) {
+                // This "virtual" device could be input from any of the attached devices.
+                // Look to see if any gamepads are connected.
+                int[] ids = InputDevice.getDeviceIds();
+                for (int id : ids) {
+                    InputDevice dev = InputDevice.getDevice(id);
+                    if (dev == null) {
+                        // This device was removed during enumeration
+                        continue;
+                    }
+
+                    // If there are any gamepad devices connected, we'll
+                    // report that this virtual device is a gamepad.
+                    if (hasJoystickAxes(dev) || hasGamepadButtons(dev)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
         // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
         return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
     }
@@ -461,6 +491,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.vibrator = dev.getVibrator();
         }
 
+        // Detect if the gamepad has Mode and Select buttons according to the Android key layouts.
+        // We do this first because other codepaths below may override these defaults.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            boolean[] buttons = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
+            context.hasMode = buttons[0];
+            context.hasSelect = buttons[1] || buttons[2];
+        }
+
         context.leftStickXAxis = MotionEvent.AXIS_X;
         context.leftStickYAxis = MotionEvent.AXIS_Y;
         if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -519,6 +557,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     // The old DS4 driver uses RX and RY for triggers
                     context.leftTriggerAxis = MotionEvent.AXIS_RX;
                     context.rightTriggerAxis = MotionEvent.AXIS_RY;
+
+                    // DS4 has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasSelect = true;
+                    context.hasMode = true;
                 }
                 else {
                     // If it's not a non-standard DS4 controller, it's probably an Xbox controller or
@@ -600,6 +642,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 context.backIsStart = true;
                 context.modeIsSelect = true;
                 context.triggerDeadzone = 0.30f;
+                context.hasSelect = true;
+                context.hasMode = false;
             }
         }
 
@@ -617,6 +661,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     if (!hasStartKey[0] && !hasStartKey[1]) {
                         context.backIsStart = true;
                         context.modeIsSelect = true;
+                        context.hasSelect = true;
+                        context.hasMode = false;
                     }
                 }
 
@@ -625,14 +671,26 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 context.triggerDeadzone = 0.30f;
             }
             // SHIELD controllers will use small stick deadzones
-            else if (devName.contains("SHIELD")) {
+            else if (devName.contains("SHIELD") || devName.contains("NVIDIA Controller")) {
                 context.leftStickDeadzoneRadius = 0.07f;
                 context.rightStickDeadzoneRadius = 0.07f;
+
+                // The big Nvidia button on the Shield controllers acts like a Search button. It
+                // summons the Google Assistant on the Shield TV. On my Pixel 4, it seems to do
+                // nothing, so we can hijack it to act like a mode button.
+                if (devName.contains("NVIDIA Controller v01.03") || devName.contains("NVIDIA Controller v01.04")) {
+                    context.searchIsMode = true;
+                    context.hasMode = true;
+                }
             }
             // The Serval has a couple of unknown buttons that are start and select. It also has
             // a back button which we want to ignore since there's already a select button.
             else if (devName.contains("Razer Serval")) {
                 context.isServal = true;
+
+                // Serval has Select and Mode buttons (possibly mapped non-standard)
+                context.hasMode = true;
+                context.hasSelect = true;
             }
             // The Xbox One S Bluetooth controller has some mappings that need fixing up.
             // However, Microsoft released a firmware update with no change to VID/PID
@@ -643,6 +701,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             else if (devName.equals("Xbox Wireless Controller")) {
                 if (gasRange == null) {
                     context.isNonStandardXboxBtController = true;
+
+                    // Xbox One S has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasMode = true;
+                    context.hasSelect = true;
                 }
             }
         }
@@ -665,6 +727,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return null;
         }
 
+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (event.getDeviceId() == -1) {
+                return defaultContext;
+            }
+        }
+
         // Return the existing context if it exists
         InputDeviceContext context = inputDeviceContexts.get(event.getDeviceId());
         if (context != null) {
@@ -1018,6 +1087,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // Emulate the select button with mode
             return KeyEvent.KEYCODE_BUTTON_SELECT;
         }
+        else if (context.searchIsMode && keyCode == KeyEvent.KEYCODE_SEARCH) {
+            // Emulate the mode button with search
+            return KeyEvent.KEYCODE_BUTTON_MODE;
+        }
 
         return keyCode;
     }
@@ -1416,6 +1489,41 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return false;
         }
 
+        // Check if we're emulating the select button
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
+        {
+            // If either start or LB is up, select comes up too
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+                (context.inputMap & ControllerPacket.LB_FLAG) == 0)
+            {
+                context.inputMap &= ~ControllerPacket.BACK_FLAG;
+
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
+
+                try {
+                    Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
+                } catch (InterruptedException ignored) {}
+            }
+        }
+
+        // Check if we're emulating the special button
+        if ((context.emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
+        {
+            // If either start or select and RB is up, the special button comes up too
+            if ((context.inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
+                ((context.inputMap & ControllerPacket.BACK_FLAG) == 0 &&
+                 (context.inputMap & ControllerPacket.RB_FLAG) == 0))
+            {
+                context.inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                context.emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
+
+                try {
+                    Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
+                } catch (InterruptedException ignored) {}
+            }
+        }
+
         sendControllerInputPacket(context);
 
         if (context.pendingExit && context.inputMap == 0) {
@@ -1444,6 +1552,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
         switch (keyCode) {
         case KeyEvent.KEYCODE_BUTTON_MODE:
+            context.hasMode = true;
             context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
@@ -1455,6 +1564,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             break;
         case KeyEvent.KEYCODE_BACK:
         case KeyEvent.KEYCODE_BUTTON_SELECT:
+            context.hasSelect = true;
             context.inputMap |= ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
@@ -1535,6 +1645,43 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.pendingExit = true;
         }
 
+        // Start+LB acts like select for controllers with one button
+        if (!context.hasSelect) {
+            if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG) ||
+                    (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                            SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+            {
+                context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+                context.inputMap |= ControllerPacket.BACK_FLAG;
+
+                context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+            }
+        }
+
+        // If there is a physical select button, we'll use Start+Select as the special button combo
+        // otherwise we'll use Start+RB.
+        if (!context.hasMode) {
+            if (context.hasSelect) {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG)) {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
+            else {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG) ||
+                        (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                                SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+                {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
+        }
+
         // We don't need to send repeat key down events, but the platform
         // sends us events that claim to be repeats but they're from different
         // devices, so we just send them all and deal with some duplicates.
@@ -1676,10 +1823,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public boolean isServal;
         public boolean backIsStart;
         public boolean modeIsSelect;
+        public boolean searchIsMode;
         public boolean ignoreBack;
         public boolean hasJoystickAxes;
         public boolean pendingExit;
 
+        public int emulatingButtonFlags = 0;
+        public boolean hasSelect;
+        public boolean hasMode;
+
         // Used for OUYA bumper state tracking since they force all buttons
         // up when the OUYA button goes down. We watch the last time we get
         // a bumper up and compare that to our maximum delay when we receive

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

@@ -66,8 +66,8 @@ public class Xbox360Controller extends AbstractXboxController {
 
     @Override
     protected boolean handleRead(ByteBuffer buffer) {
-        if (buffer.limit() < 14) {
-            LimeLog.severe("Read too small: "+buffer.limit());
+        if (buffer.remaining() < 14) {
+            LimeLog.severe("Read too small: "+buffer.remaining());
             return false;
         }
 

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

@@ -101,11 +101,21 @@ public class XboxOneController extends AbstractXboxController {
         switch (buffer.get())
         {
             case 0x20:
+                if (buffer.remaining() < 17) {
+                    LimeLog.severe("XBone button/axis read too small: "+buffer.remaining());
+                    return false;
+                }
+
                 buffer.position(buffer.position()+3);
                 processButtons(buffer);
                 return true;
 
             case 0x07:
+                if (buffer.remaining() < 4) {
+                    LimeLog.severe("XBone mode read too small: "+buffer.remaining());
+                    return false;
+                }
+
                 // The Xbox One S controller needs acks for mode reports otherwise
                 // it retransmits them forever.
                 if (buffer.get() == 0x30) {

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

@@ -18,9 +18,12 @@ public class RelativeTouchContext implements TouchContext {
     private boolean cancelled;
     private boolean confirmedMove;
     private boolean confirmedDrag;
+    private boolean confirmedScroll;
     private Timer dragTimer;
     private double distanceMoved;
     private double xFactor, yFactor;
+    private int pointerCount;
+    private int maxPointerCountInGesture;
 
     private final NvConnection conn;
     private final int actionIndex;
@@ -33,6 +36,8 @@ public class RelativeTouchContext implements TouchContext {
     private static final int TAP_TIME_THRESHOLD = 250;
     private static final int DRAG_TIME_THRESHOLD = 650;
 
+    private static final int SCROLL_SPEED_DIVISOR = 20;
+
     public RelativeTouchContext(NvConnection conn, int actionIndex,
                                 int referenceWidth, int referenceHeight, View view)
     {
@@ -59,8 +64,18 @@ public class RelativeTouchContext implements TouchContext {
 
     private boolean isTap()
     {
-        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
+        if (confirmedDrag || confirmedMove || confirmedScroll) {
+            return false;
+        }
 
+        // If this input wasn't the last finger down, do not report
+        // a tap. This ensures we don't report duplicate taps for each
+        // finger on a multi-finger tap gesture
+        if (actionIndex + 1 != maxPointerCountInGesture) {
+            return false;
+        }
+
+        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
         return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
     }
 
@@ -83,13 +98,17 @@ public class RelativeTouchContext implements TouchContext {
 
         originalTouchX = lastTouchX = eventX;
         originalTouchY = lastTouchY = eventY;
-        originalTouchTime = SystemClock.uptimeMillis();
-        cancelled = confirmedDrag = confirmedMove = false;
-        distanceMoved = 0;
 
-        if (actionIndex == 0) {
-            // Start the timer for engaging a drag
-            startDragTimer();
+        if (isNewFinger) {
+            maxPointerCountInGesture = pointerCount;
+            originalTouchTime = SystemClock.uptimeMillis();
+            cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
+            distanceMoved = 0;
+
+            if (actionIndex == 0) {
+                // Start the timer for engaging a drag
+                startDragTimer();
+            }
         }
 
         return true;
@@ -183,21 +202,33 @@ public class RelativeTouchContext implements TouchContext {
         }
     }
 
+    private void checkForConfirmedScroll() {
+        // Enter scrolling mode if we've already left the tap zone
+        // and we have 2 fingers on screen. Leave scroll mode if
+        // we no longer have 2 fingers on screen
+        confirmedScroll = (actionIndex == 0 && pointerCount == 2 && confirmedMove);
+    }
+
     @Override
     public boolean touchMoveEvent(int eventX, int eventY)
     {
+        if (cancelled) {
+            return true;
+        }
+
         if (eventX != lastTouchX || eventY != lastTouchY)
         {
+            checkForConfirmedMove(eventX, eventY);
+            checkForConfirmedScroll();
+
             // We only send moves and drags for the primary touch point
             if (actionIndex == 0) {
-                checkForConfirmedMove(eventX, eventY);
-
                 int deltaX = eventX - lastTouchX;
                 int deltaY = eventY - lastTouchY;
 
                 // Scale the deltas based on the factors passed to our constructor
-                deltaX = (int)Math.round((double)Math.abs(deltaX) * xFactor);
-                deltaY = (int)Math.round((double)Math.abs(deltaY) * yFactor);
+                deltaX = (int) Math.round((double) Math.abs(deltaX) * xFactor);
+                deltaY = (int) Math.round((double) Math.abs(deltaY) * yFactor);
 
                 // Fix up the signs
                 if (eventX < lastTouchX) {
@@ -207,6 +238,16 @@ public class RelativeTouchContext implements TouchContext {
                     deltaY = -deltaY;
                 }
 
+                if (pointerCount == 2) {
+                    if (confirmedScroll) {
+                        deltaY /= SCROLL_SPEED_DIVISOR;
+
+                        conn.sendMouseHighResScroll((short) deltaY);
+                    }
+                } else {
+                    conn.sendMouseMove((short) deltaX, (short) deltaY);
+                }
+
                 // If the scaling factor ended up rounding deltas to zero, wait until they are
                 // non-zero to update lastTouch that way devices that report small touch events often
                 // will work correctly
@@ -216,8 +257,6 @@ public class RelativeTouchContext implements TouchContext {
                 if (deltaY != 0) {
                     lastTouchY = eventY;
                 }
-
-                conn.sendMouseMove((short)deltaX, (short)deltaY);
             }
             else {
                 lastTouchX = eventX;
@@ -247,5 +286,11 @@ public class RelativeTouchContext implements TouchContext {
     }
 
     @Override
-    public void setPointerCount(int pointerCount) {}
+    public void setPointerCount(int pointerCount) {
+        this.pointerCount = pointerCount;
+
+        if (pointerCount > maxPointerCountInGesture) {
+            maxPointerCountInGesture = pointerCount;
+        }
+    }
 }

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

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.os.SystemClock;
 import android.view.MotionEvent;
 
 import java.util.ArrayList;
@@ -270,7 +271,7 @@ public class AnalogStick extends VirtualControllerElement {
         // We also release the deadzone if the user keeps the stick pressed for a bit to allow
         // them to make precise movements.
         stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE ||
-                System.currentTimeMillis() - timeLastClick > timeoutDeadzone ||
+                SystemClock.uptimeMillis() - timeLastClick > timeoutDeadzone ||
                 movement_radius > radius_dead_zone) ?
                 STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;
 
@@ -311,7 +312,7 @@ public class AnalogStick extends VirtualControllerElement {
                 stick_state = STICK_STATE.MOVED_IN_DEAD_ZONE;
                 // check for double click
                 if (lastClickState == CLICK_STATE.SINGLE &&
-                        timeLastClick + timeoutDoubleClick > System.currentTimeMillis()) {
+                        timeLastClick + timeoutDoubleClick > SystemClock.uptimeMillis()) {
                     click_state = CLICK_STATE.DOUBLE;
                     notifyOnDoubleClick();
                 } else {
@@ -319,7 +320,7 @@ public class AnalogStick extends VirtualControllerElement {
                     notifyOnClick();
                 }
                 // reset last click timestamp
-                timeLastClick = System.currentTimeMillis();
+                timeLastClick = SystemClock.uptimeMillis();
                 // set item pressed and update
                 setPressed(true);
                 break;

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

@@ -20,6 +20,7 @@ import android.media.MediaFormat;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
 import android.os.Build;
+import android.os.SystemClock;
 import android.util.Range;
 import android.view.SurfaceHolder;
 
@@ -109,8 +110,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName(), meteredNetwork)) {
                 LimeLog.info("Found HEVC decoder, but it's not whitelisted - "+decoderInfo.getName());
 
-                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR
-                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr) {
+                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR.
+                // > 4K streaming also requires HEVC, so force it on there too.
+                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr ||
+                        prefs.width > 4096 || prefs.height > 4096) {
                     LimeLog.info("Forcing H265 enabled despite non-whitelisted decoder");
                 }
                 else {
@@ -249,6 +252,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                 return -1;
             }
 
+            if (width > 4096 || height > 4096) {
+                LimeLog.severe("> 4K streaming only supported on HEVC");
+                return -1;
+            }
+
             // These fixups only apply to H264 decoders
             needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(selectedDecoderName);
             needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(selectedDecoderName);
@@ -410,7 +418,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             //
             if (initialException != null) {
                 // This isn't the first time we've had an exception processing video
-                if (System.currentTimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
+                if (SystemClock.uptimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
                     // It's been over 3 seconds and we're still getting exceptions. Throw the original now.
                     if (!reportedCrash) {
                         reportedCrash = true;
@@ -427,7 +435,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                 else {
                     initialException = new RendererException(this, e);
                 }
-                initialExceptionTimestamp = System.currentTimeMillis();
+                initialExceptionTimestamp = SystemClock.uptimeMillis();
             }
         }
     }
@@ -630,14 +638,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     @SuppressWarnings("deprecation")
     @Override
     public int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                int frameNumber, long receiveTimeMs) {
+                                int frameNumber, long receiveTimeMs, long enqueueTimeMs) {
         if (stopping) {
             // Don't bother if we're stopping
             return MoonBridge.DR_OK;
         }
 
         if (lastFrameNumber == 0) {
-            activeWindowVideoStats.measurementStartTimestamp = System.currentTimeMillis();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
         } else if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
             // We can receive the same "frame" multiple times if it's an IDR frame.
             // In that case, each frame start NALU is submitted independently.
@@ -649,7 +657,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         lastFrameNumber = frameNumber;
 
         // Flip stats windows roughly every second
-        if (System.currentTimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
+        if (SystemClock.uptimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
             if (prefs.enablePerfOverlay) {
                 VideoStats lastTwo = new VideoStats();
                 lastTwo.add(lastWindowVideoStats);
@@ -682,7 +690,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             globalVideoStats.add(activeWindowVideoStats);
             lastWindowVideoStats.copy(activeWindowVideoStats);
             activeWindowVideoStats.clear();
-            activeWindowVideoStats.measurementStartTimestamp = System.currentTimeMillis();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
         }
 
         activeWindowVideoStats.totalFramesReceived++;
@@ -691,11 +699,13 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         int inputBufferIndex;
         ByteBuffer buf;
 
-        long timestampUs = System.nanoTime() / 1000;
+        long timestampUs = enqueueTimeMs * 1000;
 
         if (!FRAME_RENDER_TIME_ONLY) {
-            // Count time from first packet received to decode start
-            activeWindowVideoStats.totalTimeMs += (timestampUs / 1000) - receiveTimeMs;
+            // Count time from first packet received to enqueue time as receive time
+            // We will count DU queue time as part of decoding, because it is directly
+            // caused by a slow decoder.
+            activeWindowVideoStats.totalTimeMs += enqueueTimeMs - receiveTimeMs;
         }
 
         if (timestampUs <= lastTimestampUs) {

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

@@ -124,7 +124,7 @@ public class MediaCodecHelper {
         whitelistedHevcDecoders = new LinkedList<>();
 
         // Allow software HEVC decoding in the official AOSP emulator
-        if (Build.HARDWARE.equals("ranchu") && Build.BRAND.equals("google")) {
+        if (Build.HARDWARE.equals("ranchu")) {
             whitelistedHevcDecoders.add("omx.google");
         }
 

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

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

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

@@ -40,6 +40,7 @@ import android.net.NetworkCapabilities;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
+import android.os.SystemClock;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -176,7 +177,7 @@ public class ComputerManagerService extends Service {
                                 LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
                                 offlineCount++;
                             } else {
-                                tuple.lastSuccessfulPollMs = System.currentTimeMillis();
+                                tuple.lastSuccessfulPollMs = SystemClock.elapsedRealtime();
                                 offlineCount = 0;
                             }
                         }
@@ -207,7 +208,7 @@ public class ComputerManagerService extends Service {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     // Enforce the poll data TTL
-                    if (System.currentTimeMillis() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
+                    if (SystemClock.elapsedRealtime() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
                         LimeLog.info("Timing out polled state for "+tuple.computer.name);
                         tuple.computer.state = ComputerDetails.State.UNKNOWN;
                     }

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

@@ -115,7 +115,17 @@ public class NvConnection {
         //
         
         // Check for a supported stream resolution
-        if (context.streamConfig.getHeight() >= 2160 && !h.supports4K(serverInfo)) {
+        if ((context.streamConfig.getWidth() > 4096 || context.streamConfig.getHeight() > 4096) &&
+                (h.getServerCodecModeSupport(serverInfo) & 0x200) == 0) {
+            context.connListener.displayMessage("Your host PC does not support streaming at resolutions above 4K.");
+            return false;
+        }
+        else if ((context.streamConfig.getWidth() > 4096 || context.streamConfig.getHeight() > 4096) &&
+                !context.streamConfig.getHevcSupported()) {
+            context.connListener.displayMessage("Your streaming device must support H.265 to stream at resolutions above 4K.");
+            return false;
+        }
+        else if (context.streamConfig.getHeight() >= 2160 && !h.supports4K(serverInfo)) {
             // Client wants 4K but the server can't do it
             context.connListener.displayTransientMessage("You must update GeForce Experience to stream in 4K. The stream will be 1080p.");
             

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

@@ -10,7 +10,7 @@ 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, long receiveTimeMs);
+                                         int frameNumber, long receiveTimeMs, long enqueueTimeMs);
     
     public abstract void cleanup();
 

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

@@ -227,7 +227,7 @@ public class NvHTTP {
                 break;
             case (XmlPullParser.TEXT):
                 if (currentTag.peek().equals(tagname)) {
-                    return xpp.getText().trim();
+                    return xpp.getText();
                 }
                 break;
             }
@@ -557,11 +557,11 @@ public class NvHTTP {
             case (XmlPullParser.TEXT):
                 NvApp app = appList.getLast();
                 if (currentTag.peek().equals("AppTitle")) {
-                    app.setAppName(xpp.getText().trim());
+                    app.setAppName(xpp.getText());
                 } else if (currentTag.peek().equals("ID")) {
-                    app.setAppId(xpp.getText().trim());
+                    app.setAppId(xpp.getText());
                 } else if (currentTag.peek().equals("IsHdrSupported")) {
-                    app.setHdrSupported(xpp.getText().trim().equals("1"));
+                    app.setHdrSupported(xpp.getText().equals("1"));
                 }
                 break;
             }

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

@@ -36,6 +36,7 @@ public class MoonBridge {
     public static final int ML_ERROR_GRACEFUL_TERMINATION = 0;
     public static final int ML_ERROR_NO_VIDEO_TRAFFIC = -100;
     public static final int ML_ERROR_NO_VIDEO_FRAME = -101;
+    public static final int ML_ERROR_UNEXPECTED_EARLY_TERMINATION = -102;
 
     public static final int ML_PORT_INDEX_TCP_47984 = 0;
     public static final int ML_PORT_INDEX_TCP_47989 = 1;
@@ -148,11 +149,11 @@ public class MoonBridge {
     }
 
     public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength,
-                                               int decodeUnitType,
-                                               int frameNumber, long receiveTimeMs) {
+                                               int decodeUnitType, int frameNumber,
+                                               long receiveTimeMs, long enqueueTimeMs) {
         if (videoRenderer != null) {
             return videoRenderer.submitDecodeUnit(decodeUnitData, decodeUnitLength,
-                    decodeUnitType, frameNumber, receiveTimeMs);
+                    decodeUnitType, frameNumber, receiveTimeMs, enqueueTimeMs);
         }
         else {
             return DR_OK;
@@ -293,13 +294,11 @@ public class MoonBridge {
 
     public static native int testClientConnectivity(String testServerHostName, int referencePort, int testFlags);
 
-    public static native int getPortFromPortFlagIndex(int portFlagIndex);
-
-    public static native String getProtocolFromPortFlagIndex(int portFlagIndex);
-
     public static native int getPortFlagsFromStage(int stage);
 
     public static native int getPortFlagsFromTerminationErrorCode(int errorCode);
 
+    public static native String stringifyPortFlags(int portFlags, String separator);
+
     public static native void init();
 }

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

@@ -83,6 +83,7 @@ public class PreferenceConfiguration {
     public static final String RES_1080P = "1920x1080";
     public static final String RES_1440P = "2560x1440";
     public static final String RES_4K = "3840x2160";
+    public static final String RES_NATIVE = "Native";
 
     public int width, height, fps;
     public int bitrate;
@@ -108,6 +109,30 @@ public class PreferenceConfiguration {
     public boolean touchscreenTrackpad;
     public MoonBridge.AudioConfiguration audioConfiguration;
 
+    public static boolean isNativeResolution(int width, int height) {
+        // It's not a native resolution if it matches an existing resolution option
+        if (width == 640 && height == 360) {
+            return false;
+        }
+        else if (width == 854 && height == 480) {
+            return false;
+        }
+        else if (width == 1280 && height == 720) {
+            return false;
+        }
+        else if (width == 1920 && height == 1080) {
+            return false;
+        }
+        else if (width == 2560 && height == 1440) {
+            return false;
+        }
+        else if (width == 3840 && height == 2160) {
+            return false;
+        }
+
+        return true;
+    }
+
     private static String convertFromLegacyResolutionString(String resString) {
         if (resString.equalsIgnoreCase("360p")) {
             return RES_360P;

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

@@ -25,8 +25,11 @@ import com.limelight.LimeLog;
 import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.binding.video.MediaCodecHelper;
+import com.limelight.utils.Dialog;
 import com.limelight.utils.UiHelper;
 
+import java.util.Arrays;
+
 public class StreamSettings extends Activity {
     private PreferenceConfiguration previousPrefs;
 
@@ -65,6 +68,7 @@ public class StreamSettings extends Activity {
     }
 
     public static class SettingsFragment extends PreferenceFragment {
+        private int nativeResolutionStartIndex = Integer.MAX_VALUE;
 
         private void setValue(String preferenceKey, String value) {
             ListPreference pref = (ListPreference) findPreference(preferenceKey);
@@ -72,6 +76,37 @@ public class StreamSettings extends Activity {
             pref.setValue(value);
         }
 
+        private void addNativeResolutionEntry(int nativeWidth, int nativeHeight) {
+            ListPreference pref = (ListPreference) findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING);
+
+            String newName = getResources().getString(R.string.resolution_prefix_native) + " ("+nativeWidth+"x"+nativeHeight+")";
+            String newValue = nativeWidth+"x"+nativeHeight;
+
+            CharSequence[] values = pref.getEntryValues();
+
+            // Check if the native resolution is already present
+            for (CharSequence value : values) {
+                if (newValue.equals(value.toString())) {
+                    // It is present in the default list, so don't add it again
+                    return;
+                }
+            }
+
+            CharSequence[] newEntries = Arrays.copyOf(pref.getEntries(), pref.getEntries().length + 1);
+            CharSequence[] newValues = Arrays.copyOf(values, values.length + 1);
+
+            // Add the new native option
+            newEntries[newEntries.length - 1] = newName;
+            newValues[newValues.length - 1] = newValue;
+
+            pref.setEntries(newEntries);
+            pref.setEntryValues(newValues);
+
+            if (newValues.length - 1 < nativeResolutionStartIndex) {
+                nativeResolutionStartIndex = newValues.length - 1;
+            }
+        }
+
         private void removeValue(String preferenceKey, String value, Runnable onMatched) {
             int matchingCount = 0;
 
@@ -108,8 +143,6 @@ public class StreamSettings extends Activity {
             pref.setEntryValues(entryValues);
         }
 
-
-
         private void resetBitrateToDefault(SharedPreferences prefs, String res, String fps) {
             if (res == null) {
                 res = prefs.getString(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
@@ -200,6 +233,8 @@ public class StreamSettings extends Activity {
                     int width = Math.max(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
                     int height = Math.min(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
 
+                    addNativeResolutionEntry(width, height);
+
                     if ((width >= 3840 || height >= 2160) && maxSupportedResW < 3840) {
                         maxSupportedResW = 3840;
                     }
@@ -299,6 +334,12 @@ public class StreamSettings extends Activity {
                     // Never remove 720p
                 }
             }
+            else {
+                Display display = getActivity().getWindowManager().getDefaultDisplay();
+                int width = Math.max(display.getWidth(), display.getHeight());
+                int height = Math.min(display.getWidth(), display.getHeight());
+                addNativeResolutionEntry(width, height);
+            }
 
             if (!PreferenceConfiguration.readPreferences(this.getActivity()).unlockFps) {
                 // We give some extra room in case the FPS is rounded down
@@ -408,6 +449,25 @@ public class StreamSettings extends Activity {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
                     String valueStr = (String) newValue;
 
+                    // Detect if this value is the native resolution option
+                    CharSequence[] values = ((ListPreference)preference).getEntryValues();
+                    boolean isNativeRes = true;
+                    for (int i = 0; i < values.length; i++) {
+                        // Look for a match prior to the start of the native resolution entries
+                        if (valueStr.equals(values[i].toString()) && i < nativeResolutionStartIndex) {
+                            isNativeRes = false;
+                            break;
+                        }
+                    }
+
+                    // If this is native resolution, show the warning dialog
+                    if (isNativeRes) {
+                        Dialog.displayDialog(getActivity(),
+                                getResources().getString(R.string.title_native_res_dialog),
+                                getResources().getString(R.string.text_native_res_dialog),
+                                false);
+                    }
+
                     // Write the new bitrate value
                     resetBitrateToDefault(prefs, valueStr, null);
 

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

@@ -101,11 +101,7 @@ public class ServerHelper {
                 }
                 else {
                     dialogSummary = parent.getResources().getString(R.string.nettest_text_failure);
-                    for (int i = 0; i < 32; i++) {
-                        if ((ret & (1 << i)) != 0) {
-                            dialogSummary += MoonBridge.getProtocolFromPortFlagIndex(i) + " " + MoonBridge.getPortFromPortFlagIndex(i) + "\n";
-                        }
-                    }
+                    dialogSummary += MoonBridge.stringifyPortFlags(ret, "\n");
                 }
 
                 Dialog.displayDialog(parent,

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

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

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

@@ -79,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", "([BIIIJ)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");
@@ -157,7 +157,8 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
 
             ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                               DecodedFrameBuffer, currentEntry->length, currentEntry->bufferType,
-                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs);
+                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs,
+                                              (jlong)decodeUnit->enqueueTimeMs);
             if ((*env)->ExceptionCheck(env)) {
                 // We will crash here
                 (*JVM)->DetachCurrentThread(JVM);
@@ -178,7 +179,7 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
     ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                        DecodedFrameBuffer, offset, BUFFER_TYPE_PICDATA,
                                        decodeUnit->frameNumber,
-                                       (jlong)decodeUnit->receiveTimeMs);
+                                       (jlong)decodeUnit->receiveTimeMs, (jlong)decodeUnit->enqueueTimeMs);
     if ((*env)->ExceptionCheck(env)) {
         // We will crash here
         (*JVM)->DetachCurrentThread(JVM);

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

@@ -115,17 +115,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_testClientConnectivity(JNIEnv *env, j
     return ret;
 }
 
-JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getPortFromPortFlagIndex(JNIEnv *env, jclass clazz, jint portFlagIndex) {
-    return LiGetPortFromPortFlagIndex(portFlagIndex);
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getProtocolFromPortFlagIndex(JNIEnv *env, jclass clazz, jint portFlagIndex) {
-    int protocol = LiGetProtocolFromPortFlagIndex(portFlagIndex);
-    return (*env)->NewStringUTF(env, protocol == IPPROTO_TCP ? "TCP" : "UDP");
-}
-
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jclass clazz, jint stage) {
     return LiGetPortFlagsFromStage(stage);
@@ -134,4 +123,15 @@ Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jc
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromTerminationErrorCode(JNIEnv *env, jclass clazz, jint errorCode) {
     return LiGetPortFlagsFromTerminationErrorCode(errorCode);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_stringifyPortFlags(JNIEnv *env, jclass clazz, jint portFlags, jstring separator) {
+    const char* separatorStr = (*env)->GetStringUTFChars(env, separator, NULL);
+    char outputBuffer[512];
+
+    LiStringifyPortFlags(portFlags, separatorStr, outputBuffer, sizeof(outputBuffer));
+
+    (*env)->ReleaseStringUTFChars(env, separator, separatorStr);
+    return (*env)->NewStringUTF(env, outputBuffer);
 }

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_label" translatable="false">Moonlight</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root)</string>
 
     <!-- Shortcut strings -->
     <string name="scut_deleted_pc">PC gelöscht</string>
@@ -13,13 +15,23 @@
     <string name="help_loading_msg">Lade Hilfesanzeige…</string>
 
     <!-- PC view menu entries -->
-    <string name="pcview_menu_app_list">Spiele List anzeigen</string>
+    <string name="pcview_menu_app_list">Spiele anzeigen</string>
     <string name="pcview_menu_pair_pc">Mit PC verbinden</string>
     <string name="pcview_menu_unpair_pc">Verbindung beenden</string>
     <string name="pcview_menu_send_wol">Wake-On-LAN Anfrage senden</string>
     <string name="pcview_menu_delete_pc">PC löschen</string>
+    <string name="pcview_menu_test_network">Netzwerkverbindung testen</string>
     <string name="pcview_menu_details">Details anzeigen</string>
 
+    <!-- Network test strings -->
+    <string name="nettest_title_waiting">Netzwerkverbindung wird getest</string>
+    <string name="nettest_text_waiting">Moonlight testet Ihre Netzwerkverbindung, um festzustellen, ob NVIDIA GameStream blockiert ist. Dies kann einige Sekunden dauern...</string>
+    <string name="nettest_title_done">Netzwerktest abgeschlossen</string>
+    <string name="nettest_text_success">Ihr Netzwerk scheint das Mondlicht nicht zu blockieren. Wenn Sie weiterhin Probleme mit der Verbindung haben, überprüfen Sie die Firewall-Einstellungen Ihres PC\n\n\n Wenn Sie versuchen, über das Internet zu streamen, installieren Sie das Moonlight Internet Hosting Tool auf Ihrem PC und führen Sie den mitgelieferten Internet-Streaming-Tester aus, um die Internetverbindung Ihres PCs zu überprüfen.</string>
+    <string name="nettest_text_inconclusive">Der Netzwerktest konnte nicht durchgeführt werden, da keiner der Verbindungstestserver von Moonlight erreichbar war. Überprüfen Sie Ihre Internetverbindung oder versuchen Sie es später noch einmal.</string>
+    <string name="nettest_text_failure">Die aktuelle Netzwerkverbindung Ihres Geräts scheint das Mondlicht zu blockieren. Das Streaming über das Internet funktioniert möglicherweise nicht, während Sie mit diesem Netzwerk verbunden sind.\n\n Folgende Netzwerkports wurden blockiert:\n</string>
+    <string name="nettest_text_blocked">Die aktuelle Netzwerkverbindung Ihres Geräts blockiert Moonlight. Das Streaming über das Internet funktioniert möglicherweise nicht, während Sie mit diesem Netzwerk verbunden sind.</string>
+
     <!-- Pair messages -->
     <string name="pairing">Verbinden…</string>
     <string name="pair_pc_offline">Computer ist offline</string>
@@ -28,16 +40,16 @@
     <string name="pair_pairing_msg">Bitte geben sie folgenden PIN auf ihrem PC ein:</string>
     <string name="pair_incorrect_pin">PIN inkorrekt</string>
     <string name="pair_fail">Verbindung fehlgeschlagen</string>
-    <string name="pair_already_in_progress">Verbindungsaufbau rebreits im gange</string>
+    <string name="pair_already_in_progress">Verbindungsaufbau bereits im Gange</string>
 
     <!-- WOL messages -->
     <string name="wol_pc_online">Computer ist online</string>
     <string name="wol_no_mac">PC konnte nicht geweckt werden, da GFE keine MAC-Adresse gesendet hat.</string>
     <string name="wol_waking_pc">PC wird geweckt…</string>
-    <string name="wol_waking_msg">Es kann einige Momente dauert ihren PC zu wecken.
+    <string name="wol_waking_msg">Es kann einige Momente dauern ihren PC zu wecken.
         Sollte dies fehlschlagen stellen sie bitte sicher, dass Wake-On-LAN korrekt konfiguriert ist.
     </string>
-    <string name="wol_fail">Sender der Wake-On-LAN Pakete ist fehlgeschlagen</string>
+    <string name="wol_fail">Senden der Wake-On-LAN Pakete ist fehlgeschlagen.</string>
 
     <!-- Unpair messages -->
     <string name="unpairing">Trenne Verbindung…</string>
@@ -50,31 +62,35 @@
     <string name="error_manager_not_running">Der ComputerManager Service läuft nicht. Bitte warten sie ein paar Sekunden oder starten sie Die App neu.</string>
     <string name="error_unknown_host">Host konnte nicht aufgelößt werden.</string>
     <string name="error_404">GFE ist auf einen HTTP 404 Fehler gestoßen. Stellen sie sicher, dass die GPU ihres PCs unterstützt wird.
-	  Die verwendung von Remote-Desktop Software kann ebenso diesen Fehler verursachen. Starten sie ihren Computer neu oder reinstallieren sie GFE.
+	  Die Verwendung von Remote-Desktop Software kann ebenso diesen Fehler verursachen. Starten sie ihren Computer neu oder reinstallieren sie GFE.
     </string>
     <string name="title_decoding_error">Video Decoder ist gecrashed</string>
     <string name="message_decoding_error">Moonlight ist wegen einer Inkompatibilität zu dem Video-Decoder ihres Gerätes gecrasht. Stellen sie sicher, dass GeForce Experience Version auf ihrem PC auf dem neuesten Stand ist. Sollten weiterin Crashes auftreten, versuchen sie ihre Stream Einstellungen zu justieren.</string>
     <string name="title_decoding_reset">Video Einstellungen zurücksetzen</string>
-    <string name="message_decoding_reset">Der Video-Decoder ihres Geärts ist wiederholt mit den ausgewählten Einstellungen gecrasht. Ihre streaming einstellungen wurden zurückgesetzt.</string>
+    <string name="message_decoding_reset">Der Video-Decoder ihres Geräts ist wiederholt mit den ausgewählten Einstellungen gecrasht. Ihre Streamingeinstellungen wurden zurückgesetzt.</string>
     <string name="error_usb_prohibited">USB Zugriff ist administrativ unterbunden. Bitte überprüfen sie ihre Knox oder MDM Einstellungen.</string>
     <string name="unable_to_pin_shortcut">Die zur Zeit aktive Launcher App ünterstützt das erstellen angehefteter Shortcuts nicht.</string>
+    <string name="video_decoder_init_failed">Der Videodecoder konnte nicht initialisiert werden. Ihr Gerät unterstützt möglicherweise die gewählte Auflösung oder Bildfrequenz nicht.</string>
+    <string name="no_video_received_error">Kein Video vom Gastgeber empfangen. Überprüfen Sie die Firewall und Portweiterleitungsregeln des Host-PCs.</string>
+    <string name="no_frame_received_error">Ihre Netzwerkverbindung funktioniert nicht gut. Reduzieren Sie die Einstellung der Videobitrate oder versuchen Sie eine schnellere Verbindung.</string>
 
     <!-- Start application messages -->
     <string name="conn_establishing_title">Verbindung herstellen</string>
     <string name="conn_establishing_msg">Verbindung starten</string>
-    <string name="conn_metered">Warnung: Das Datentransfairvolument ihrer Netzwerkverbindung ist limitiert!</string>
+    <string name="conn_metered">Warnung: Das Datentransfervolumen ihrer Netzwerkverbindung ist limitiert!</string>
     <string name="conn_client_latency">Durchschnittliche Frame-Dekodierungslatenz:</string>
     <string name="conn_client_latency_hw">Hardware-Dekodierungslatenz:</string>
     <string name="conn_hardware_latency">Durchschnittliche Hardware-Dekodierungslatenz:</string>
     <string name="conn_starting">Startet</string>
-    <string name="conn_error_title">Verbindingsfehler</string>
+    <string name="conn_error_title">Verbindungsfehler</string>
     <string name="conn_error_msg">Start fehlgeschlagen</string>
     <string name="conn_terminated_title">Verbindung beendet</string>
-    <string name="conn_terminated_msg">Die verbinding wurde beendet</string>
+    <string name="conn_terminated_msg">Die Verbindung wurde beendet</string>
 
     <!-- General strings -->
     <string name="ip_hint">IP-Adresse des GeForce PCs</string>
-    <string name="searching_pc">Suche nach PCs wo GeForce Experience aktiv ist…</string>
+    <string name="searching_pc">Suche nach PCs wo GeForce Experience aktiv ist…\n\n
+    Stellen Sie sicher, dass GameStream in den GeForce Experience SHIELD-Einstellungen aktiviert ist.</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="lost_connection">Verbindung zum PC verloren</string>
@@ -83,7 +99,7 @@
     <string name="delete_pc_msg">Sind sie sicher, dass sie diesen PC löschen möchten?</string>
     <string name="slow_connection_msg">Langsame Verbindung zum PC\nReduzieren sie die Bitrate</string>
     <string name="poor_connection_msg">Sehr langsame Verbindung zum PC</string>
-    <string name="perf_overlay_text">Videodimensionen: %1$s\nDecoder: %2$s\nGeschätzte PC Bildwiederholrate: %3$.2f FPS\nBildwiederholrate der Netzwerkübertragung: %4$.2f FPS\nWiedergabe-Bildwiederholungsrate: %5$.2f FPS\nWegen Netzwerkübertraung ausgelassene Frames: %6$.2f%%\nDurchschnittliche Übertragunsdauer: %7$.2f ms\nDurchschnittliche decoding dauer: %8$.2f ms</string>
+    <string name="perf_overlay_text">Videodimensionen: %1$s\nDecoder: %2$s\nGeschätzte PC Bildwiederholrate: %3$.2f FPS\nBildwiederholrate der Netzwerkübertragung: %4$.2f FPS\nWiedergabe-Bildwiederholungsrate: %5$.2f FPS\nWegen Netzwerkübertraung ausgelassene Frames: %6$.2f%%\nDurchschnittliche Übertragungsdauer: %7$.2f ms\nDurchschnittliche decoding dauer: %8$.2f ms</string>
 
     <!-- AppList activity -->
     <string name="applist_connect_msg">Verbinde mit PC…</string>
@@ -94,12 +110,13 @@
     <string name="applist_menu_details">Details anzeigen</string>
     <string name="applist_menu_scut">Shortcut erstellen</string>
     <string name="applist_menu_tv_channel">Zu Kanal hinzufügen</string>
+    <string name="applist_menu_hide_app">App ausblenden</string>
     <string name="applist_refresh_title">App Liste</string>
     <string name="applist_refresh_msg">Aktualisiere Apps…</string>
     <string name="applist_refresh_error_title">Fehler</string>
     <string name="applist_refresh_error_msg">Abfrage der App-Liste fehlgeschlagen</string>
     <string name="applist_quit_app">Beenden</string>
-    <string name="applist_quit_success">Erfolgreich Beendet</string>
+    <string name="applist_quit_success">Erfolgreich beendet</string>
     <string name="applist_quit_fail">Beenden fehlgeschlagen</string>
     <string name="applist_quit_confirmation">Sind sie sicher, dass die die laufende App schließen möchten? Ungespeicherte Daten gehen verloren.</string>
     <string name="applist_details_id">App ID:</string>
@@ -107,7 +124,7 @@
     <!-- Add computer manually activity -->
     <string name="title_add_pc">PC manuell hinzufügen</string>
     <string name="msg_add_pc">Verbinde zum PC…</string>
-    <string name="addpc_fail">Verbindung fehlgeschlagen. Stellen sie sicher, dass die benötigten ports von einer Firewall gefiltert werden.</string>
+    <string name="addpc_fail">Verbindung fehlgeschlagen. Stellen sie sicher, dass die benötigten Ports von einer Firewall gefiltert werden.</string>
     <string name="addpc_success">Computer erfolgreich hinzugefügt</string>
     <string name="addpc_unknown_host">Auflößen der PC-Adresse fehlgeschlagen. Stellen sie sicher, dass die Adresse keine Tippfehler beinhaltet.</string>
     <string name="addpc_enter_ip">Sie müssen eine IP-Addresse eingeben.</string>
@@ -119,33 +136,34 @@
     <string name="summary_resolution_list">Ehöhen für klarere Bilder. Reduzieren für flüssigere Darstellung auf langsameren Geräten und Netzwerken.</string>
     <string name="title_fps_list">Bildwiederholungsrate</string>
     <string name="summary_fps_list">Erhöhen für einen gleichmäßigeren Video-Stream. Verringern um auf langsameren Geräten eine bessere Performance zu erzielen.</string>
-    <string name="title_seekbar_bitrate">Video bitrate</string>
+    <string name="title_seekbar_bitrate">Video Bitrate</string>
     <string name="summary_seekbar_bitrate">Erhöhen für einen schärferen Video-Stream. Verringern um auf langsameren Geräten eine bessere Performance zu erzielen.</string>
-    <string name="title_unlock_fps">Alle Bildwiederholungsraten freigeben</string>
-    <string name="summary_unlock_fps">Streaming mit 90 oder 120 FPS reduziert gegebenfalls die Latenz auf High-End Geräten, für jedoch zu Crashes oder Lag auf Geräten die dies nicht untersützen können.</string>
-    <string name="title_checkbox_stretch_video">Video auf den ganzen Bildschirm ausdehnen</string>
-    <string name="title_checkbox_disable_warnings">Warnhinweise deaktivieren</string>
-    <string name="summary_checkbox_disable_warnings">Verbindungswarnungen nicht als Overlay wärend des Streamens anzeigen</string>
-    <string name="title_checkbox_enable_pip">Bild-in-Bild Überwachungsmodus aktivieren</string>
-    <string name="summary_checkbox_enable_pip">Stream auch während des Multitaskings anzeigen (ohne Steuerung)</string>
+    <string name="suffix_seekbar_bitrate_mbps">Mbps</string>
+    <string name="title_checkbox_stretch_video">Video auf Vollbildschirm strecken</string>
 
     <string name="category_audio_settings">Audio Einstellungen</string>
+    <string name="title_audio_config_list">Surround Sound Konfiguration </string>
+    <string name="summary_audio_config_list">Aktivieren von 5.1- oder 7.1-Surround-Sound für Heimkinosysteme</string>
 
     <string name="category_input_settings">Eingabe Einstellungen</string>
+    <string name="title_checkbox_touchscreen_trackpad">Verwenden des Touchscreen als Trackpad</string>
+    <string name="summary_checkbox_touchscreen_trackpad">Wenn aktiviert, verhält sich der Touchscreen wie ein Trackpad. Wenn er deaktiviert ist, steuert der Touchscreen den Mauszeiger direkt.</string>
     <string name="title_checkbox_multi_controller">Automatische GamePad-Erkennung</string>
-    <string name="summary_checkbox_multi_controller">Abwählen dieser Option erzwingt dass immer ein GamePad present ist</string>
+    <string name="summary_checkbox_multi_controller">Abwählen dieser Option erzwingt dass immer ein GamePad präsent ist</string>
     <string name="title_checkbox_vibrate_fallback">Vibrationsemulation aktivieren</string>
     <string name="summary_checkbox_vibrate_fallback">Lässt das Gerät vibrieren falls das GamePad keine Vibration unterstütz</string>
-    <string name="title_seekbar_deadzone">Tot Bereich des Analogsticks</string>
+    <string name="title_seekbar_deadzone">Deadzone des Analogsticks</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One GamePad Treiber</string>
     <string name="summary_checkbox_xb1_driver">Aktiviert eingebauten USB Treiber für Geräte die keinen Xbox GamePad-Unterstützung haben</string>
     <string name="title_checkbox_usb_bind_all">Android GamePad Unterstütung überlagern</string>
-    <string name="summary_checkbox_usb_bind_all">Erzwingt die Vernwedung von Moonlight\'s USB Treiber für alle Xbox kompatiblen GamePads</string>
+    <string name="summary_checkbox_usb_bind_all">Erzwingt die Verwendung von Moonlights USB Treiber für alle Xbox kompatiblen GamePads</string>
     <string name="title_checkbox_mouse_emulation">Maus Emulation via GamePad</string>
     <string name="summary_checkbox_mouse_emulation">Langes gedrückt halten der Start-Taste wechselt in den Maus Modus</string>
     <string name="title_checkbox_mouse_nav_buttons">Vor- und Zurück-Tasten aktivieren</string>
     <string name="summary_checkbox_mouse_nav_buttons">Aktivierung dieser Option kann auf fehleranfälligen Geräten Rechts-Clicks verunmöglichen</string>
+    <string name="title_checkbox_flip_face_buttons">Buttons umkehren</string>
+    <string name="summary_checkbox_flip_face_buttons">Kehrt die Buttons A/B und X/Y für Gamepads und die Bildschirmsteuerung um</string>
 
     <string name="category_on_screen_controls_settings">On-Screen Steuerungseinstellungen</string>
     <string name="title_checkbox_show_onscreen_controls">Zeige On-Screen Steuerung</string>
@@ -159,8 +177,14 @@
     <string name="dialog_title_reset_osc">Layout Zurücksetzen</string>
     <string name="dialog_text_reset_osc">Sind sie sicher, dass sie das gepseicherte on-screen Layout der Steuerelemte löschen wollen?</string>
     <string name="toast_reset_osc_success">On-Screen Steuerelemente wurden zurückgesetzt</string>
+    <string name="title_osc_opacity">Ändern der Transparenz von Bildschirmsteuerelementen</string>
+    <string name="summary_osc_opacity">Steuerelemente auf dem Bildschirm mehr/weniger transparent machen</string>
+    <string name="suffix_osc_opacity">%</string>
+    <string name="dialog_title_osc_opacity">Transparenz</string>
 
     <string name="category_ui_settings">UI Einstellungen</string>
+    <string name="title_checkbox_enable_pip">Aktivieren des Bild-in-Bild-Beobachtungsmodus</string>
+    <string name="summary_checkbox_enable_pip">Ermöglicht die Anzeige (aber nicht die Steuerung) des Streams während des Multitasking</string>
     <string name="title_language_list">Sprache</string>
     <string name="summary_language_list">Sprache die Moonlight verwenden soll</string>
     <string name="title_checkbox_small_icon_mode">Verwende kleine Icons</string>
@@ -174,14 +198,17 @@
 
     <string name="category_advanced_settings">Erweiterte Einstellungen</string>
     <string name="title_disable_frame_drop">Nie Frames Überspringen</string>
+    <string name="title_unlock_fps">Alle möglichen Bildfrequenzen freischalten</string>
+    <string name="summary_unlock_fps">Streaming mit 90 oder 120 FPS kann die Latenzzeit auf High-End-Geräten verringern, kann aber bei Geräten, die dies nicht unterstützen, zu Verzögerungen oder Instabilität führen.</string>
+    <string name="title_checkbox_disable_warnings">Warnhinweise deaktivieren</string>
+    <string name="summary_checkbox_disable_warnings">On-Screen Warnmeldungen während des Streaming deaktivieren</string>
     <string name="summary_disable_frame_drop">Kann potentiell das Mikro-Ruckeln auf einigen Geräten reduzieren, allerdings erhöt dies gleichzeitig die Latenz</string>
     <string name="title_video_format">Ändere H.265 Einstellungen</string>
-    <string name="summary_video_format">H.265 verringerd die Video-Bandbreitenanforderung, funktioniert allerdings nur auf sehr neuen Geräten</string>
+    <string name="summary_video_format">H.265 verringert die Video-Bandbreitenanforderung, funktioniert allerdings nur auf sehr neuen Geräten</string>
     <string name="title_enable_hdr">HDR aktivieren (experimentell)</string>
     <string name="summary_enable_hdr">HDR-Streaming sofern dies von der PC GPU unterstützt wird. HDR erfordert eine GPU der GTX 1000 Serie oder neuer.</string>
     <string name="title_enable_perf_overlay">Performance Overlay aktivieren</string>
     <string name="summary_enable_perf_overlay">Leistungsmerkmale während des Streamens in Echtzeit einblenden.</string>
-    <string name="suffix_osc_opacity">%</string>
-    <string name="dialog_title_osc_opacity">Transparenz</string>
-
+    <string name="title_enable_post_stream_toast">Zeige Informationen über Latenz nach Streaming</string>
+     <string name="summary_enable_post_stream_toast">Anzeige einer Informationsmeldung über Latenz nach dem Ende des Streams</string>
 </resources>

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

@@ -8,6 +8,8 @@
         <item>1440p</item>
         <item>4K</item>
     </string-array>
+
+    <!-- Keep this in sync with PreferenceConfiguration.isNativeResolution()! -->
     <string-array name="resolution_values" translatable="false">
         <item>640x360</item>
         <item>854x480</item>

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

@@ -15,8 +15,10 @@
     <string name="help_loading_msg">Loading help page…</string>
 
     <!-- PC view menu entries -->
-    <string name="pcview_menu_app_list">View Apps</string>
-    <string name="pcview_menu_full_app_list">View Hidden Apps</string>
+    <string name="pcview_menu_header_online">Online</string>
+    <string name="pcview_menu_header_offline">Offline</string>
+    <string name="pcview_menu_header_unknown">Refreshing</string>
+    <string name="pcview_menu_app_list">View All Apps</string>
     <string name="pcview_menu_pair_pc">Pair with PC</string>
     <string name="pcview_menu_unpair_pc">Unpair</string>
     <string name="pcview_menu_send_wol">Send Wake-On-LAN request</string>
@@ -72,8 +74,10 @@
     <string name="error_usb_prohibited">USB access is prohibited by your device administrator. Check your Knox or MDM settings.</string>
     <string name="unable_to_pin_shortcut">Your current launcher does not allow for creating pinned shortcuts.</string>
     <string name="video_decoder_init_failed">Video decoder failed to initialize. Your device may not support the selected resolution or frame rate.</string>
-    <string name="no_video_received_error">No video received from host. Check the host PC\'s firewall and port forwarding rules.</string>
+    <string name="no_video_received_error">No video received from host.</string>
     <string name="no_frame_received_error">Your network connection isn\'t performing well. Reduce your video bitrate setting or try a faster connection.</string>
+    <string name="early_termination_error">Something went wrong on your host PC when starting the stream.\n\nMake sure you don\'t have any DRM-protected content open on your host PC. You can also try restarting your host PC.\n\nIf the issue persists, try reinstalling your GPU drivers and GeForce Experience.</string>
+    <string name="check_ports_msg">Check your firewall and port forwarding rules for port(s):</string>
 
     <!-- Start application messages -->
     <string name="conn_establishing_title">Establishing Connection</string>
@@ -135,12 +139,15 @@
     <string name="category_basic_settings">Basic Settings</string>
     <string name="title_resolution_list">Video resolution</string>
     <string name="summary_resolution_list">Increase to improve image clarity. Decrease for better performance on lower end devices and slower networks.</string>
+    <string name="title_native_res_dialog">Native Resolution Warning</string>
+    <string name="text_native_res_dialog">Native resolution modes are not officially supported by GeForce Experience, so it will not set your host display resolution itself. You will need to set it manually while in game.\n\nIf you choose to create a custom resolution in NVIDIA Control Panel to match your device resolution, please ensure you have read and understood NVIDIA\'s warning regarding possible monitor damage, PC instability, and other potential problems.\n\nWe are not responsible for any problems resulting from creating a custom resolution on your PC.\n\nFinally, your device or host PC may not support streaming at native resolution. If it doesn\'t work on your device, you\'re just out of luck unfortunately.</string>
     <string name="title_fps_list">Video frame rate</string>
     <string name="summary_fps_list">Increase for a smoother video stream. Decrease for better performance on lower end devices.</string>
     <string name="title_seekbar_bitrate">Video bitrate</string>
     <string name="summary_seekbar_bitrate">Increase for better image quality. Decrease to improve performance on slower connections.</string>
     <string name="suffix_seekbar_bitrate_mbps">Mbps</string>
     <string name="title_checkbox_stretch_video">Stretch video to full-screen</string>
+    <string name="resolution_prefix_native">Native</string>
 
     <string name="category_audio_settings">Audio Settings</string>
     <string name="title_audio_config_list">Surround sound configuration</string>

build.gradle

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

fastlane/metadata/android/en-US/changelogs/245.txt

@@ -0,0 +1,3 @@
+- Gamepad button combos to emulate missing Select and Guide buttons have been reintroduced
+- For gamepads without a Select button, LB+Start will trigger the Select button and RB+Start will trigger the Guide button
+- For gamepads with a Select button, Start+Select will trigger the Guide button

fastlane/metadata/android/en-US/changelogs/246.txt

@@ -0,0 +1 @@
+- Enabled raw mouse input on the Nvidia Shield TV to avoid mouse acceleration

fastlane/metadata/android/en-US/changelogs/247.txt

@@ -0,0 +1 @@
+- Fixed missing video or audio when streaming over some Internet connections

fastlane/metadata/android/en-US/changelogs/251.txt

@@ -0,0 +1,4 @@
+- Added the option to stream at your device's native resolution
+- Added 2 finger scrolling in touchpad mode
+- Added additional troubleshooting information when a connection fails
+- Minor UI tweaks and crash fixes

fastlane/metadata/android/en-US/changelogs/252.txt

@@ -0,0 +1,3 @@
+- Added support for multiple native resolution options
+- Improve accuracy of decoder latency reports for very slow decoders
+- Minor UI improvements

fastlane/metadata/android/en-US/changelogs/253.txt

@@ -0,0 +1,2 @@
+- Add a workaround for the Android 11 gamepad bug when Accessibility features are enabled
+- See https://issuetracker.google.com/issues/163120692 for more details

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu May 28 11:41:09 PDT 2020
+#Mon Oct 12 13:42:18 CDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip