pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 20:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update recent call history and call method to protect for zero value from SIMPL

Browse Source
This commit is contained in:
Jonathan Arndt
2022-02-09 11:39:35 -08:00
parent faabdde3f7
commit c84525ddef
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
View File

@@ -1516,7 +1516,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
return; return;
} }
SendText(string.Format("xConfiguration Audio SoundsAndAlerts RingVolume: [0]", volume)); SendText(string.Format("xConfiguration Audio SoundsAndAlerts RingVolume: {0}", volume));
} }
/// <summary> /// <summary>

18
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -982,6 +982,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
private void SelectDirectoryEntry(IHasDirectory codec, ushort i, BasicTriList trilist, VideoCodecControllerJoinMap joinMap) private void SelectDirectoryEntry(IHasDirectory codec, ushort i, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
{ {
if (i < 1 || i > codec.CurrentDirectoryResult.CurrentDirectoryResults.Count) return;
var entry = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1]; var entry = codec.CurrentDirectoryResult.CurrentDirectoryResults[i - 1];
if (entry is DirectoryFolder) if (entry is DirectoryFolder)
@@ -1047,10 +1049,12 @@ ScreenIndexIsPinnedTo: {8} (a{17})
const int offset = maxStrings; const int offset = maxStrings;
var stringIndex = 0; var stringIndex = 0;
var arrayIndex = 0; var arrayIndex = 0;
var tokenArray = new XSigToken[contact.ContactMethods.Count]; // Create a new token array and set the size to the number of methods times the total number of signals
var tokenArray = new XSigToken[maxMethods * offset];
Debug.Console(2, this, "Creating XSIG token array with size {0}", maxMethods * offset);
// TODO: Add code to generate XSig data // TODO: Add code to generate XSig data
foreach (var method in contact.ContactMethods) foreach (var method in contact.ContactMethods)
{ {
if (arrayIndex >= maxMethods * offset) if (arrayIndex >= maxMethods * offset)
@@ -1606,11 +1610,17 @@ ScreenIndexIsPinnedTo: {8} (a{17})
// Selected item action and feedback // Selected item action and feedback
trilist.SetUShortSigAction(joinMap.SelectRecentCallItem.JoinNumber, (u) => trilist.SetUShortSigAction(joinMap.SelectRecentCallItem.JoinNumber, (u) =>
{ {
if (u == 0 || u > codec.CallHistory.RecentCalls.Count)
{
Debug.Console(2, this, "Recent Call History index out of range");
return;
}
_selectedRecentCallItemIndex = (int)(u - 1); _selectedRecentCallItemIndex = (int)(u - 1);
trilist.SetUshort(joinMap.SelectRecentCallItem.JoinNumber, u); trilist.SetUshort(joinMap.SelectRecentCallItem.JoinNumber, u);
var _selectedRecentCallItem = codec.CallHistory.RecentCalls[_selectedRecentCallItemIndex]; var _selectedRecentCallItem = codec.CallHistory.RecentCalls[_selectedRecentCallItemIndex];
if (_selectedRecentCallItem != null) if (_selectedRecentCallItem != null)
{ {
trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, _selectedRecentCallItem.Name); trilist.SetString(joinMap.SelectedRecentCallName.JoinNumber, _selectedRecentCallItem.Name);