diff options
Diffstat (limited to 'base/src/main/java/com/smartdevicelink/managers/screen/choiceset')
7 files changed, 14 insertions, 31 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java index 0abb94e0a..0e91747a8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java @@ -149,7 +149,9 @@ abstract class BaseChoiceSetManager extends BaseSubManager { // remove listeners internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener); - internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); + if (internalInterface.getSystemCapabilityManager() != null) { + internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); + } super.dispose(); } @@ -537,8 +539,10 @@ abstract class BaseChoiceSetManager extends BaseSubManager { defaultMainWindowCapability = null; } }; - this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); - + if (internalInterface.getSystemCapabilityManager() != null) { + this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); + } + // HMI UPDATES hmiListener = new OnRPCNotificationListener() { @Override diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java index 6585ad810..c85333cbe 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java @@ -35,13 +35,14 @@ package com.smartdevicelink.managers.screen.choiceset; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.smartdevicelink.proxy.TTSChunkFactory; import com.smartdevicelink.proxy.rpc.KeyboardProperties; import com.smartdevicelink.proxy.rpc.TTSChunk; import com.smartdevicelink.proxy.rpc.VrHelpItem; +import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities; import com.smartdevicelink.util.DebugTool; import java.util.ArrayList; +import java.util.Collections; import java.util.Hashtable; import java.util.List; @@ -108,15 +109,15 @@ public class ChoiceSet { // Help the dev by creating TTS chunks for them if (initialPrompt != null){ - setInitialPrompt(TTSChunkFactory.createSimpleTTSChunks(initialPrompt)); + setInitialPrompt(Collections.singletonList(new TTSChunk(initialPrompt, SpeechCapabilities.TEXT))); } if (timeoutPrompt != null){ - setTimeoutPrompt(TTSChunkFactory.createSimpleTTSChunks(timeoutPrompt)); + setTimeoutPrompt(Collections.singletonList(new TTSChunk(timeoutPrompt, SpeechCapabilities.TEXT))); } if (helpPrompt != null){ - setHelpPrompt(TTSChunkFactory.createSimpleTTSChunks(helpPrompt)); + setHelpPrompt(Collections.singletonList(new TTSChunk(helpPrompt, SpeechCapabilities.TEXT))); } // things to do @@ -397,5 +398,4 @@ public class ChoiceSet { } return clonedHelpItems; } - } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java index 8672b1b83..290a1f05f 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java @@ -74,7 +74,7 @@ class DeleteChoicesOperation extends Task { if (deleteChoices.size() > 0) { if (internalInterface.get() != null) { - internalInterface.get().sendRequests(deleteChoices, new OnMultipleRequestListener() { + internalInterface.get().sendRPCs(deleteChoices, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java index 13b19238d..9178e6c74 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java @@ -37,14 +37,6 @@ import java.util.List; public interface KeyboardAutocompleteCompletionListener { /** - * This listener is called when you wish to update your autocomplete text in response to the user's input - * @param updatedAutoCompleteText - The new autocomplete text to use - * @deprecated use {@link #onUpdatedAutoCompleteList(List<String>)} instead - */ - @Deprecated - void onUpdatedAutoCompleteText(String updatedAutoCompleteText); - - /** * This listener is called when you wish to update your autocomplete suggestions list in response to the user's input * @param updatedAutoCompleteList - The new autocomplete suggestions list to use */ diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java index d8a921b8a..21bf2d712 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java @@ -154,7 +154,7 @@ class PreloadChoicesOperation extends Task { } if (internalInterface.get() != null){ - internalInterface.get().sendRequests(choiceRPCs, new OnMultipleRequestListener() { + internalInterface.get().sendRPCs(choiceRPCs, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java index 121b1f6c0..c0e206eed 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java @@ -341,15 +341,8 @@ class PresentChoiceSetOperation extends Task { // Notify of Keypress keyboardListener.updateAutocompleteWithInput(onKeyboard.getData(), new KeyboardAutocompleteCompletionListener() { @Override - public void onUpdatedAutoCompleteText(String updatedAutoCompleteText) { - keyboardProperties.setAutoCompleteText(updatedAutoCompleteText); - updateKeyboardProperties(null); - } - - @Override public void onUpdatedAutoCompleteList(List<String> updatedAutoCompleteList) { keyboardProperties.setAutoCompleteList(updatedAutoCompleteList != null ? updatedAutoCompleteList : new ArrayList<String>()); - keyboardProperties.setAutoCompleteText(updatedAutoCompleteList != null && !updatedAutoCompleteList.isEmpty() ? updatedAutoCompleteList.get(0) : null); updateKeyboardProperties(null); } }); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java index 33db35607..b48bbffd2 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java @@ -286,12 +286,6 @@ class PresentKeyboardOperation extends Task { // Notify of Keypress keyboardListener.updateAutocompleteWithInput(onKeyboard.getData(), new KeyboardAutocompleteCompletionListener() { @Override - public void onUpdatedAutoCompleteText(String updatedAutoCompleteText) { - keyboardProperties.setAutoCompleteText(updatedAutoCompleteText); - updateKeyboardProperties(null); - } - - @Override public void onUpdatedAutoCompleteList(List<String> updatedAutoCompleteList) { keyboardProperties.setAutoCompleteList(updatedAutoCompleteList != null ? updatedAutoCompleteList : new ArrayList<String>()); keyboardProperties.setAutoCompleteText(updatedAutoCompleteList != null && !updatedAutoCompleteList.isEmpty() ? updatedAutoCompleteList.get(0) : null); |