Fix PredefinedLayout.NON_MEDIA not found in templatesAvailable (#1706)

* Fix Non-Media Sync template bug in BaseSystemCapabilityManager

* Add unit test for sync bug for NON_MEDIA template

Co-authored-by: Julian Kast <julian@livio.com>

Author: JulianKast

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java

@@ -942,6 +942,31 @@ public void testManagerBeforeDisplayUpdate() {
         assertNull(systemCapabilityManager.getWindowCapability(PredefinedWindows.PRIMARY_WIDGET.getValue()));
     }
 
+    /**
+     * Test that when we receive template "NON_MEDIA" it gets converted to "NON-MEDIA"
+     */
+    @Test
+    public void testSyncNonMediaBug() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
+        OnRPCListener dlRpcListener = iSDL.rpcListeners.get(FunctionID.SET_DISPLAY_LAYOUT.getId()).get(0);
+
+        DisplayCapabilities displayCapabilities = new DisplayCapabilities();
+        displayCapabilities.setGraphicSupported(true);
+        List<String> templatesAvailable = new ArrayList<>();
+        templatesAvailable.add("NON_MEDIA");
+        templatesAvailable.add("MEDIA");
+        displayCapabilities.setTemplatesAvailable(templatesAvailable);
+
+        SetDisplayLayoutResponse newLayout = new SetDisplayLayoutResponse();
+        newLayout.setDisplayCapabilities(displayCapabilities);
+        newLayout.setSuccess(true);
+        newLayout.setResultCode(Result.SUCCESS);
+        dlRpcListener.onReceived(newLayout);
+
+        assertTrue(systemCapabilityManager.getDefaultMainWindowCapability().getTemplatesAvailable().contains("NON-MEDIA"));
+    }
+
     private class InternalSDLInterface implements ISdl {
         private final Object RPC_LISTENER_LOCK = new Object();
         SparseArray<CopyOnWriteArrayList<OnRPCListener>> rpcListeners = new SparseArray<>();

base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java

@@ -133,8 +133,16 @@ private List<DisplayCapability> createDisplayCapabilityList(DisplayCapabilities
             return Collections.singletonList(displayCapability);
         }
 
+        // HAX: Issue #1705, Ford Sync bug returning incorrect template name for "NON-MEDIA" (https://github.com/smartdevicelink/sdl_java_suite/issues/1705).
+        List<String> templatesAvailable = display.getTemplatesAvailable();
+        for (int i = 0; i < templatesAvailable.size(); i++) {
+            if (templatesAvailable.get(i).equals("NON_MEDIA")) {
+                templatesAvailable.set(i, "NON-MEDIA");
+                break;
+            }
+        }
         // copy all available display capabilities
-        defaultWindowCapability.setTemplatesAvailable(display.getTemplatesAvailable());
+        defaultWindowCapability.setTemplatesAvailable(templatesAvailable);
         defaultWindowCapability.setNumCustomPresetsAvailable(display.getNumCustomPresetsAvailable());
         defaultWindowCapability.setTextFields(display.getTextFields());
         defaultWindowCapability.setImageFields(display.getImageFields());