In `@Ginger/Ginger/Activities/ActivityPage.xaml.cs`:
- Around line 98-123: The catch in the SetIconImageType logic swallows
exceptions; change it to catch Exception (e) and log the error via
Reporter.ToLog(eLogLevel.ERROR, "...") including the exception and context
(e.g., Activity/TargetApplication), so failures when calling
WorkSpace.Instance.Solution.GetApplicationPlatformForTargetApp or
Amdocs.Ginger.Common.GeneralLib.General.GetEnumValueDescription are recorded;
keep the existing fallback (platformText) and continue setting
xIconImage.ImageToolTip/xIconImage.ToolTip.

In
`@Ginger/Ginger/AutomatePageLib/AddActionMenu/WindowExplorer/Common/WindowExplorerPage.xaml.cs`:
- Around line 1326-1386: Duplicate image scale/offset math in
HighlightSelectedElement and DrawElementRectangleAsync should be extracted into
a shared helper; add a private method (e.g., ComputeImageScaleAndOffset(Image
img, double sourceWidth, double sourceHeight) returning (double usedScaleX,
double usedScaleY, double offsetX, double offsetY)) that contains the Stretch
(Uniform/UniformToFill/Fill) logic, scale calculation and centering offsets,
then replace the inline calculations in HighlightSelectedElement and
DrawElementRectangleAsync to call this helper and use its returned values for
mapping ClickedPoint/display coords to source coords; ensure the helper handles
missing BitmapSource sizes and uses the same clamping/epsilon behavior.
- Around line 1496-1545: The empty catch blocks must log the caught exceptions:
change both catch blocks to catch (Exception e) and call
Reporter.ToLog(eLogLevel.DEBUG, $"<context>: {e}") — for the first catch (around
bitmap source access) include context like "WindowExplorerPage: failed reading
bitmap source for mScreenShotViewPage.xMainImage", and for the second catch
(around ((DriverBase)mWindowExplorerDriver).SetRectangleProperties) include
context like "WindowExplorerPage: SetRectangleProperties threw" while preserving
existing fallback assignments to rectangleWidth/rectangleHeight and not altering
logic for ElementStartPoint/ElementMaxPoint or clickedElementInfo.
- Around line 1144-1152: The empty catch swallowing exceptions around
mWindowExplorerDriver.UnHighLightElements() should be replaced with logging:
catch the exception as ex and call Reporter.ToLog(eLogLevel.DEBUG,
$"UnHighLightElements failed: {ex.Message}", ex) (or equivalent overload) so the
exception and stack trace are recorded; update the catch block in the method
containing the mWindowExplorerDriver.UnHighLightElements() call to log the
exception at DEBUG level using Reporter.ToLog rather than ignoring it.
- Around line 1451-1468: Remove the nested try/catch inside Task.Run and instead
schedule the call to mWindowExplorerDriver?.HighLightElement(...) with a
continuation that logs failures consistently; e.g. call Task.Run(() =>
mWindowExplorerDriver?.HighLightElement(inspectElementInfo,
locateElementByItLocators: false)).ContinueWith(t =>
Reporter.ToLog(eLogLevel.DEBUG, "HighlightSelectedElement: driver
HighLightElement failed: " + t.Exception?.GetBaseException().Message,
t.Exception), TaskContinuationOptions.OnlyOnFaulted) so you keep fire-and-forget
behavior but centralize and unify logging for exceptions thrown by
HighLightElement.

In `@Ginger/Ginger/Drivers/DriversConfigsEditPages/AppiumDriverEditPage.xaml.cs`:
- Around line 977-1095: The UFTMBasicCallAsync method lacks request timeouts and
cancellation; update UFTMBasicCallAsync to accept an optional CancellationToken
parameter and configure RestClient with RestClientOptions (e.g., MaxTimeout) for
both the token request and the follow-up client (references: UFTMBasicCallAsync,
authClient, client, authRequest, request), then call the ExecuteAsync overloads
that accept a CancellationToken and pass the token through to all network awaits
to enable proper timeout and cancellation handling.
- Around line 1048-1051: The empty catch in AppiumDriverEditPage.xaml.cs that
swallows JSON parsing exceptions should be replaced with a catch(Exception ex)
that logs the exception and the offending response so failures are visible;
update the block that parses the authentication response (the code that sets
accessToken) to log ex.Message/stack and the raw response (using the existing
logging facility in the class, e.g., Reporter/Logger) and then allow the
method's existing null-accessToken handling to proceed.
- Around line 27-37: Remove the unused using directives from the top of
AppiumDriverEditPage.xaml.cs in the AppiumDriverEditPage class: delete
System.Net.Http, System.Net.Http.Headers and System.Text (only if
Encoding/StringBuilder aren’t used elsewhere in that file); keep RestSharp and
any namespaces actually referenced (e.g., System.Text.Json) and rebuild to
ensure no missing references remain.
- Around line 767-770: Replace the empty catch in the AppiumDriverEditPage
radio-button initialization (page load handler in AppiumDriverEditPage.xaml.cs)
with a typed catch (catch(Exception ex)) and log the exception instead of
silently swallowing it; use the project's logging utility (e.g., Reporter.ToLog
or the existing logger) or System.Diagnostics.Trace/Debug to record a
descriptive message plus ex.ToString() so debugging information is preserved
while keeping behavior unchanged.
- Around line 600-617: The fire-and-forget Task.Run around
mAgent?.AgentOperations (the GingerCore.AgentOperations ops block) can lead to
unobserved failures and no user feedback; change the call to a proper awaited
async flow (e.g., expose/convert the caller to async and await the operation
instead of Task.Run) or explicitly capture the returned Task and handle faults
with ContinueWith/await, and on failure (catch around ops.SetDriverConfiguration
/ ops.WaitForAgentToBeReady) log the exception and surface a user notification
(toast/dialog) so the user is informed when SetDriverConfiguration or
WaitForAgentToBeReady fails; ensure you reference and update the code paths that
call this block so the async usage is properly awaited rather than
fire-and-forget.
- Around line 1080-1083: The code currently sends the session identifier using
request.AddHeader("JSESSIONID", cookieSessionId); change this to send it as an
actual cookie using RestSharp's cookie API: locate the request variable and the
cookieSessionId value (extracted earlier in AppiumDriverEditPage.xaml.cs) and
replace the header call with request.AddCookie("JSESSIONID", cookieSessionId) so
the JSESSIONID is transmitted as a cookie in subsequent requests.

In `@Ginger/Ginger/Drivers/DriversConfigsEditPages/UFTCredentialsDialog.xaml`:
- Line 15: The outer ScrollViewer xMainScrollViewer contains an inner
ScrollViewer xDevicesScrollViewer which can steal scroll events and lead to
broken scrolling; fix by removing the inner ScrollViewer and replacing it with a
non-scrolling panel (e.g., Grid/StackPanel/ItemsControl) or, if inner scrolling
is required, disable its vertical scrolling
(VerticalScrollBarVisibility="Disabled" or set CanContentScroll appropriately)
and/or adjust PanningMode so only the intended ScrollViewer handles scroll
input; update the markup around xDevicesScrollViewer (or the container used by
it) and test nested scrolling behaviour after the change.
- Line 1: The class UFTCredentialsDialog currently inherits Page but uses a
"Dialog" name; either rename the class and XAML x:Class to UFTCredentialsPage
(and rename the files accordingly) to follow the {Feature}Page convention, or if
it should be a window change the base class to Window and rename to
UFTCredentialsWindow; update the code-behind partial class name and constructor
(UFTCredentialsDialog -> UFTCredentialsPage or UFTCredentialsWindow), adjust the
XAML x:Class attribute to match, and fix all references/usages (instantiations,
resource dictionaries, and project file entries) so the new type name is
consistent.

In `@Ginger/Ginger/Drivers/DriversConfigsEditPages/UFTCredentialsDialog.xaml.cs`:
- Around line 637-663: ApplyFilters currently replaces
xPhonesListBox.ItemsSource with a new List, breaking the binding to the
ObservableCollection mPhones; change to use a CollectionView (e.g., store
ICollectionView mPhonesView created in InitPhonesList via
CollectionViewSource.GetDefaultView(mPhones)), set mPhonesView.Filter (implement
PhoneFilter to apply the same platform/workspace/status/availability checks),
assign xPhonesListBox.ItemsSource once to mPhonesView in InitPhonesList, and
then have ApplyFilters simply call mPhonesView?.Refresh() so the UI stays bound
to mPhones and reflects dynamic updates.
- Around line 149-160: The page currently subscribes
CredentialsParam_PropertyChanged to mClientIdParam, mClientSecretParam and
mTenantIdParam but never unsubscribes, causing a potential memory leak; add
cleanup that removes those handlers (e.g., handle the page Unloaded event or
implement IDisposable) and in that cleanup method call
mClientIdParam.PropertyChanged -= CredentialsParam_PropertyChanged,
mClientSecretParam.PropertyChanged -= CredentialsParam_PropertyChanged and
mTenantIdParam.PropertyChanged -= CredentialsParam_PropertyChanged (guarding for
null) so subscriptions are removed when the dialog is unloaded/disposed.
- Around line 266-270: The catch block in UFTCredentialsDialog.xaml.cs that
handles failures to fetch UFTM workspaces is logging at eLogLevel.INFO; change
the log level to eLogLevel.ERROR so failures are recorded as errors, e.g. update
the Reporter.ToLog call in the catch(Exception ex) for the workspace fetch (the
"Failed to fetch UFTM workspaces" message) to use eLogLevel.ERROR and leave the
message and exception argument intact.
- Around line 308-311: In the catch block that handles failures fetching UFTM
apps (inside UFTCredentialsDialog.xaml.cs, in the method that calls the UFTM
apps fetch), replace the current Reporter.ToLog call that uses eLogLevel.INFO
with eLogLevel.ERROR (or WARN if you prefer) so the failure is logged at an
appropriate error level and keep the existing message and exception parameter
(Reporter.ToLog(eLogLevel.ERROR, "Failed to fetch UFTM apps for workspace",
ex)); this ensures the catch for fetching UFTM apps is logged as an error.
- Around line 97-101: The catch block in UFTCredentialsDialog.xaml.cs that
handles the auto-refresh on load currently logs failures with
Reporter.ToLog(eLogLevel.INFO, ...); change the log level to a failure severity
(eLogLevel.ERROR or eLogLevel.WARN) so the exception is recorded appropriately;
locate the catch(Exception ex) around the auto-refresh/on-load logic and update
the Reporter.ToLog call to use eLogLevel.ERROR (or eLogLevel.WARN) while
preserving the message and exception parameter.

In `@Ginger/Ginger/Drivers/DriversWindows/ADBDriverWindow/DeviceViewPage.xaml.cs`:
- Around line 442-463: The code computes scaleFactor from DeviceImage.Source
without guarding zero-sized image sources; add a check after obtaining image =
DeviceImage.Source to verify image.Width > 0 && image.Height > 0 and if either
is zero call Reporter.ToLog(eLogLevel.ERROR, "DeviceImage.Source has zero width
or height") (include context like device id/name if available) and return early
to avoid mispositioning rect, rather than proceeding to compute hscale/vscale
and set rect.Margin; keep existing variables scaleFactor, rect,
DeviceScreenCanvas and DeviceImage references.

In `@Ginger/Ginger/Drivers/DriversWindows/MobileDriverWindow.xaml.cs`:
- Around line 1599-1664: The code sets defaultTvWidth and defaultTvHeight both
to 500, producing a 1:1 aspect ratio instead of 16:9; update the AndroidTV
sizing logic in MobileDriverWindow.xaml.cs (within the block checking
mDriver.GetDevicePlatformType() == eDevicePlatformType.AndroidTv) to use a 16:9
ratio—either by changing the defaults (e.g., defaultTvWidth=1920,
defaultTvHeight=1080) or by computing aspectRatio = 9.0/16.0 and deriving
targetHeight = targetWidth * aspectRatio—so that mZoomSize,
xDeviceScreenshotCanvas.Width/Height and subsequent window sizing use the
correct TV aspect ratio.
- Around line 1813-1837: The read-modify-write of mLastHighlightTime and the
decision to call UnHighlightElementEvent()/set clearedHighlights are not
synchronized; wrap the entire conditional that reads mLastHighlightTime,
compares it to mHighlightPreserveDuration, may set mLastHighlightTime = null,
and sets clearedHighlights (the block containing the shouldClear logic and
subsequent if/else) inside lock(mHighlightLock) so reads and writes on
mLastHighlightTime are atomic and thread-safe; ensure you hold the lock while
evaluating (DateTime.UtcNow - mLastHighlightTime.Value) <
mHighlightPreserveDuration and while assigning mLastHighlightTime = null and
updating clearedHighlights, but avoid holding the lock while calling
UnHighlightElementEvent() if that method may re-enter locks or be long-running
(release lock before invoking it if needed).
- Around line 152-327: HighlightElementOnDevice creates a new DispatcherTimer on
every call allowing an earlier timer to clear a newer highlight; fix by
introducing a single reusable timer field (e.g., mHighlightClearTimer) started
once, and in its tick handler (HighlightClearTimer_Tick) lock mHighlightLock and
compare DateTime.UtcNow - mLastHighlightTime against mHighlightPreserveDuration,
only calling ClearHighlightedElementOnDevice() and stopping the timer when the
last highlight is older than the preserve duration; update
HighlightElementOnDevice to set mLastHighlightTime and start the shared timer
instead of creating new timers, and ensure TV path still sets mKeepHighlightTv
to true so TV highlights remain sticky.
- Around line 478-490: Before calling GetPointOnAppWindow to map mousePos, guard
against a null image source by calling SafeGetDeviceImageSource() (same pattern
used elsewhere) and return early if it is null; specifically, before
Dispatcher.Invoke and Mouse.GetPosition(xDeviceScreenshotImage), ensure
SafeGetDeviceImageSource() for xDeviceScreenshotImage is non-null and skip the
mapping if it returns null so GetPointOnAppWindow and
xDeviceScreenshotImage.Source.Width/Height are never accessed when Source is
null.

In `@Ginger/Ginger/Environments/AppsListPage.xaml.cs`:
- Line 38: SetGridView builds a new GridViewDef (including the
PlatformDescription column) but never assigns it to the UI control, so the new
view/columns aren’t applied to grdApps; after creating the GridViewDef instance
in SetGridView assign it to the grid (e.g., set grdApps.View or the control’s
appropriate View property to the new GridViewDef or call the control’s SetView
method) so the PlatformDescription column is rendered, and make the same change
for the duplicate creation at the other occurrence (lines around the second
GridViewDef creation).

In `@Ginger/Ginger/Ginger.csproj`:
- Around line 14-19: Add explicit
<CopyToOutputDirectory>Never</CopyToOutputDirectory> entries for the new
Resource items so they match existing image resource conventions: update the
Resource elements that include "radio-androidtv.png", "whiteTv.png",
"multiple_screens.png", and "multiple_screen_grey.png" to include a
CopyToOutputDirectory set to Never inside each Resource node.

In `@Ginger/Ginger/SolutionWindows/AddSolutionPage.xaml.cs`:
- Line 167: Update the string-to-enum mappings so they consistently use
"Mobile/TV" instead of "Mobile": find the mapping in AddSolutionPage that
already maps "Mobile/TV" => ePlatformType.Mobile and change the analogous
mappings in AppsListPage and AddGingerOpsEnvPage to use the same "Mobile/TV"
key; ensure any switch/case or dictionary entries that convert friendly platform
strings to the enum (ePlatformType.Mobile) are updated to "Mobile/TV" to match
the EnumValueDescription in Platform.cs and UI dropdown values.

In `@Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs`:
- Around line 1324-1340: The current fallback always creates a 1x1 bitmap when
width==0 and uses fixed 96 DPI; update the method that renders IM so it first
handles the zero-width edge case (if width==0 either return null or use a
sensible default size — reference desiredWidth/desiredHeight/width and the
caller's expected behavior) and then obtain actual DPI via
VisualTreeHelper.GetDpi(IM) (use the returned DpiScale.DpiScaleX/DpiScaleY or
DpiX/DpiY values) and pass those DPI values into the RenderTargetBitmap
constructor (and compute pixelWidth/pixelHeight using the device-independent
size * DPI/96 if needed) before calling rtb.Render(IM) and rtb.Freeze(); this
ensures correct size handling and sharp rendering on high-DPI displays.
- Around line 1201-1204: Remove the dead commented-out block in
ImageMakerControl.xaml.cs that references eImageType.RadioButton_AndroidTV and
the SetAsStaticImage call; delete the three commented lines (the case label and
its body) so the switch/logic contains only active code and no leftover
commented cases like "RadioButton_AndroidTV" or
"SetAsStaticImage(\"radio-androidtv.png\", Width: 16, Height: 16)".

In `@Ginger/Ginger/UserControlsLib/ucGridView/ucGrid.xaml.cs`:
- Around line 2161-2170: The magic number 27.0 in the Convert method should be
extracted to a named constant or resource so it can be adjusted centrally;
replace the inline literal used when checking
Amdocs.Ginger.Common.Enums.eImageType.MultipleScreen (currently assigned to
desiredWidth) with a clearly named constant (e.g., MultipleScreenImageWidth) or
a resource lookup, and update the call to ImageMakerControl.GetImageSource to
use that constant instead of 27.0; keep the existing logic and variable names
(Convert, desiredWidth, eImageType.MultipleScreen,
ImageMakerControl.GetImageSource) so the change is minimal and discoverable.

In `@Ginger/Ginger/UserControlsLib/UCListView/UcListView.xaml.cs`:
- Around line 1342-1349: Remove the duplicate Dispose method and the stray
closing brace in UcListView.xaml.cs: locate the second Dispose() implementation
that manipulates mTreeSearchCts (calls Cancel/Dispose and sets it to null) and
delete this duplicate block along with the extra closing brace so only the
original Dispose method remains, ensuring the class compiles cleanly.

In `@Ginger/Ginger/UserControlsLib/UCListView/UcListViewItem.xaml.cs`:
- Around line 98-127: The catch in EnumValueDescriptionConverter.Convert
swallows exceptions silently; update the Convert method in the
EnumValueDescriptionConverter class to log the caught exception at debug/trace
level before falling back to value.ToString(), e.g., use the project's logging
facility (or System.Diagnostics.Debug/Trace if no logger exists) and include
contextual info (enumType and value) in the message so failures inside
GingerCore.General.GetEnumValueDescription are visible while preserving the
graceful fallback behavior.
- Around line 241-282: The UpdateIconToolTip method currently swallows all
exceptions; modify its catch block to log the exception using Reporter.ToLog so
failures are visible: in UpdateIconToolTip catch (Exception ex) call
Reporter.ToLog with an Error level (or appropriate severity) and a message like
"UpdateIconToolTip failed for item" including the exception (ex) and context
(Item and mItemIconTooltipField) to aid debugging; keep swallowing the exception
after logging to preserve UI stability.
- Around line 307-350: The two empty catch blocks around the tooltip converter
discovery and the ToolTip binding swallow useful diagnostics; update the catch
handlers in the block that checks mItemIconTooltipField (surrounding the
EnumValueDescriptionConverter creation) and the catch after xItemIcon.SetBinding
to log the exception at debug/trace level (using the project's logging facility)
while preserving the existing fallback behavior (leave tooltipConverter = null
and continue). Reference: mItemIconTooltipField, tooltipConverter,
EnumValueDescriptionConverter, BindingHandler.ObjFieldBinding, xItemIcon,
ImageMakerControl.ImageToolTipProperty, and the SetBinding call when adding the
debug logs.
- Around line 156-166: The OnItemPropertyChanged method currently creates a
local uli and then pattern-matches d again into control and casts e.NewValue to
(object) redundantly; simplify by using a single pattern-match (e.g., if (d is
UcListViewItem uli && e.NewValue != null)) then assign uli.Item = e.NewValue and
call uli.ApplyTitleAndTooltipForAct(uli.Item); remove the duplicate control
variable and the unnecessary ((object)e.NewValue) cast so only UcListViewItem
uli, Item, and ApplyTitleAndTooltipForAct are used.
- Around line 54-85: The catch in ApplyTitleAndTooltipForAct currently swallows
all exceptions; change it to catch Exception (e.g., catch (Exception ex)) and
log the error via Reporter.ToLog including context (method name and relevant
item data like act?.ActionDescription/Description) before suppressing, so any
UI-thread invocation errors are recorded for debugging; ensure you reference
ApplyTitleAndTooltipForAct, Dispatcher.BeginInvoke, and Reporter.ToLog in the
fix.

In `@Ginger/GingerAutoPilotTest/SwaggetTests.cs`:
- Around line 210-239: The test TestCircularReference_PreventInfiniteLoop
currently only checks for braces which can give false positives; instead parse
the string returned by JsonSchemaTools.JsonSchemaFaker and assert it
deserializes to a valid JSON value (e.g., use
System.Text.Json.JsonDocument.Parse or
Newtonsoft.Json.JsonConvert.DeserializeObject) to ensure well-formed JSON and
avoid false positives; replace the Assert.IsTrue(result.Contains("{"))/("}"))
checks with a try/parse-and-Assert that the parse succeeded (and optionally that
the root is JsonValueKind.Object) so the test still verifies no hang and
produces valid JSON.
- Around line 241-260: Update the TestSelfReferenceElement_ReturnsEmptyObject
test to parse the returned string from JsonSchemaTools.JsonSchemaFaker into a
JSON object (e.g., using JsonDocument or JObject) instead of using Contains
checks; assert the root value is a JSON object and, if a "self" property exists
on that root, assert that its value is also a JSON object (or empty object) to
make the assertion deterministic when validating the JsonSchema4
self-referencing schema.
- Around line 262-292: The test
TestSwaggerPetSchema_WithCircularCategoryReference currently only creates a
one-way reference (petSchema → categorySchema); make it a true circular
reference by adding a back-reference from categorySchema to petSchema (e.g., add
a property on categorySchema that References petSchema) and wrap the call to
JsonSchemaTools.JsonSchemaFaker with the same timeout/guard pattern used in
TestCircularReference_PreventInfiniteLoop to prevent infinite loops during
generation; ensure assertions remain and the test still asserts completion and
presence of "name" and "category".

In `@Ginger/GingerCore/Actions/ActSikuli.cs`:
- Around line 302-311: The empty SetTextValue branch sets Error but doesn't mark
the action failed; update the failure branch in ActSikuli (where
ValueExpression.Calculate(SetTextValue) is checked) to also set Status =
eRunStatus.Failed (in addition to Error = "SetTextValue is empty") so the action
status reflects the failure; locate the block that calls
sekuliScreen.Type(sikuliPattern, textValue, KeyModifier.NONE) and add the Status
assignment in the else branch.

In `@Ginger/GingerCoreCommon/Actions/Act.cs`:
- Around line 576-590: The catch block that swallows exceptions thrown by
derived ActionDescription implementations should log the exception before
falling back to mDescription: update the Act class's ActionDescription access
code to catch (Exception ex) and emit a debug/info log entry (using the
project's logging facility) that includes the exception and context (e.g.,
this.GetType().Name and "ActionDescription"), then continue to return
mDescription so behavior is unchanged; reference the ActionDescription property
and mDescription field when making the change.

In `@Ginger/GingerCoreCommon/Drivers/CoreDrivers/Mobile/MobileDriverCommon.cs`:
- Around line 28-35: The eDeviceSource enum contains AndroidTV but it isn't
wired into the UI or capability logic; update AppiumDriverEditPage.xaml.cs to
include AndroidTV in the device source dropdown/bindings, extend
SetDeviceSourceCapabilities() to handle eDeviceSource.AndroidTV (and any
switch/if branches that parse/compare device sources) so Android TV platform
selects AndroidTV instead of being forced to LocalAppium, and ensure any
Enum.Parse/TryParse usages and device source comparisons recognize the AndroidTV
value; alternatively, if AndroidTV support is not intended, remove the AndroidTV
= 3 value from eDeviceSource to avoid dead enum entries.
- Around line 21-26: ValidateAndroidOnlyOperation currently blocks
eDevicePlatformType.AndroidTv and several switch statements for PressMenuButton,
OpenCamera, PressKey and LongPressKey only handle Android and iOS; update
behavior so AndroidTv is treated as Android where appropriate. Modify
ValidateAndroidOnlyOperation to accept eDevicePlatformType.AndroidTv as valid
for Android-only operations (PushFile, PullFile, GetDeviceLogs), and update the
switch/case handlers in methods PressMenuButton, OpenCamera, PressKey and
LongPressKey to either add explicit eDevicePlatformType.AndroidTv cases that
delegate to the Android logic or group AndroidTv with the Android case
(fallthrough) so AndroidTv devices execute the same code path and produce an
error only for unsupported platforms.

In `@Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs`:
- Around line 237-241: Remove the dead commented-out property block for Platform
in EnvApplication (the commented code defining the Platform property and its
default ePlatformType.NA value); delete those commented lines entirely so the
file contains no leftover commented-out property definitions and rely on source
control for history.
- Around line 267-275: The catch block in EnvApplication's code that calls
Amdocs.Ginger.Common.GeneralLib.General.GetEnumValueDescription(typeof(ePlatformType),
this.Platform) currently swallows exceptions; change it to catch Exception
(e.g., catch (Exception ex)) and call Reporter.ToLog(eLogLevel.ERROR, ...)
including contextual text and the exception (mentioning ePlatformType and
this.Platform) before returning this.Platform.ToString(); keep the existing
fallback return but ensure the exception is logged via Reporter.ToLog with
eLogLevel.ERROR.

In `@Ginger/GingerCoreCommon/GeneralLib/JSONLib/JsonSchemaTools.cs`:
- Around line 223-246: ReferenceStack is being pushed with different objects
(Enumeration.FirstOrDefault() or Example) but always popped by jkp.Value,
causing stale entries and false cycle detection; change the push/pop to track
the exact object pushed: compute a single variable (e.g., pushedRef) from
jkp.Value.ActualSchema.Enumeration.FirstOrDefault(),
jkp.Value.ActualSchema.Example or jkp.Value, push pushedRef onto ReferenceStack,
and when unwinding remove that same pushedRef (and similarly add/remove
PrivateStack with jkp.Value as before) so ReferenceStack push/pop are symmetric.
- Around line 247-249: Replace the places that serialize nested objects into
JSON strings and instead add the objects as proper JSON nodes: where
GenerateJsonObjectFromJsonSchema4(...) is stored in the local variable named
JObject and currently added via JsonBody.Add(key,
JsonConvert.SerializeObject(JObject)), change to add the object directly
(JsonBody.Add(key, JObject)); and for the other cases where a JObject/JsonObject
is being stringified before adding to jb (the JObject/JToken container at lines
~292 and ~341), wrap the CLR object using JToken.FromObject(JsonObject) and add
that (jb.Add(key, JToken.FromObject(JsonObject))). Ensure you reference the
GenerateJsonObjectFromJsonSchema4 result variables (JObject/JsonObject) and the
containers (JsonBody, jb) when applying these replacements.
- Around line 83-94: Remove the try/catch blocks that catch
System.StackOverflowException in JsonSchemaTools.cs (these are around accesses
to schema.ActualProperties and similar sections) because StackOverflowException
is non-recoverable; instead rely on the existing cycle detection using
ReferenceStack.Contains(schema) and the ReferenceStack.Remove(schema) cleanup
already present in methods such as the ones interacting with ActualProperties
and other schema traversals; if you still want protection against extreme depth,
add a simple recursion-depth parameter (or a depth counter stored/passed via
ReferenceStack) to the relevant methods rather than catching
StackOverflowException.

In `@Ginger/GingerCoreCommon/Repository/SharedRepository/UploadSelectionItem.cs`:
- Around line 296-305: The current logic in UploadSelectionItem (the block using
normRoot, normTarget and rootName) uses StartsWith which false-positives when
root is only a prefix (e.g., "C:\Shared" vs "C:\Shared2"); change the condition
to also verify that either normTarget exactly equals normRoot or that the
character immediately after normRoot in normTarget is a path separator ('\\' or
'/'), before computing rel and returning $"{rootName}/{rel}" (or rootName when
rel empty). This preserves the existing Trim/rel logic but prevents prefix-only
matches.

In `@Ginger/GingerCoreCommon/RunLib/Agent.cs`:
- Around line 373-374: The inline comment suggests both Appium and AndroidTV
driver types should be exposed, but the code only adds Agent.eDriverType.Appium
to driverTypes; either add the missing AndroidTV enum value (e.g.,
Agent.eDriverType.AndroidTV) to the collection where driverTypes is populated or
change the comment to accurately describe that only Appium is added; locate the
driverTypes.Add call and the Agent.eDriverType enum to update the code or
comment accordingly so they remain consistent.
- Around line 341-345: Remove the unnecessary try-catch around Enum.TryParse in
Agent.cs: replace the try-catch block that sets parsed by directly calling
parsed = Enum.TryParse<ePlatformType>(platformType, ignoreCase: true, out
resolvedPlatform); and delete the empty catch branch; this keeps the same
behavior (TryParse returns false on invalid input) and references the existing
symbols parsed and resolvedPlatform in the Agent class.
- Around line 338-359: The parsed enum value resolvedPlatform is never used
downstream: update the branching logic in Agent.cs that currently compares the
raw platformType string (the if/else chain around the eDriverType decisions) to
instead use the resolvedPlatform enum value (e.g., compare resolvedPlatform ==
ePlatformType.Mobile or resolvedPlatform.ToString(), or switch on
resolvedPlatform) so the description-fallback parsing is honored and returns the
correct eDriverType instead of eDriverType.NA.

In `@Ginger/GingerCoreNET/ActionsLib/UI/Mobile/ActMobileDevice.cs`:
- Around line 37-44: Extract the repeated Description initialization into a
private helper (e.g., InitializeDescription or EnsureDescriptionFromAction) and
call it from the ActMobileDevice constructor, DoNewActionSetup(), and
PostDeserialization(); the helper should check if
string.IsNullOrEmpty(this.Description) &&
!string.IsNullOrEmpty(this.ActionDescription) and set this.Description =
this.ActionDescription. Replace the duplicated blocks in the constructor,
DoNewActionSetup(), and PostDeserialization() with a single call to that helper
to keep behavior consistent and avoid duplication.
- Line 26: Remove the unused using directive "using System.Linq;" from the top
of ActMobileDevice.cs (the file containing the ActMobileDevice class) — locate
the directive among the other using statements and delete it so there are no
unused imports remaining.
- Around line 138-141: The empty catch in ActMobileDevice's deserialization path
should not swallow exceptions; change it to catch(Exception e) and log the error
via Reporter.ToLog(eLogLevel.ERROR, ...) including context (e.g.,
"ActMobileDevice deserialization failed") and the exception details
(e.ToString()) so failures are recorded; locate the catch in the deserialization
method of class ActMobileDevice and replace the silent catch with the logging
call.

In `@Ginger/GingerCoreNET/DataSource/LiteDB.cs`:
- Around line 672-676: The code currently only checks dt.Rows.Count==0 before
indexing dt.Rows[LocateRowValue], which can still throw IndexOutOfRangeException
if LocateRowValue is negative or >= dt.Rows.Count; update the block around the
DataRow retrieval (the check that precedes DataRow row =
dt.Rows[LocateRowValue]) to validate that LocateRowValue is within
0..dt.Rows.Count-1 and throw a clear Exception that includes DSTableName and the
invalid LocateRowValue when out of range.

In
`@Ginger/GingerCoreNET/Drivers/CoreDrivers/Mobile/Appium/GenericAppiumDriver.cs`:
- Around line 1709-1777: In EnsureDeviceBounds, add logic to handle Android TV
attributes when "bounds" is missing: after attempting boundsAttr but before
falling back to webElement.Location/Size, query the IWebElement for attributes
"x", "y", "width", and "height" (using GetAttribute) and try parsing them as
ints; if parsing succeeds, set ei.X, ei.Y, ei.Width, ei.Height accordingly and
add a ControlProperty (or properties) to ei.Properties (e.g., a synthesized
"bounds" value or individual "x"/"y"/"width"/"height" entries) so downstream
highlight/rectangle mapping uses correct dimensions; ensure you catch parsing
exceptions and only apply when all required values are valid.
- Around line 4786-4843: The IWebElement fallback in GenericAppiumDriver (the
code that finds the "best" IWebElement and constructs ElementInfo named ei from
best) only sets ei.X and ei.Y; update this block to also set ei.Width and
ei.Height (use best.Size.Width and best.Size.Height, guarded in the same
try/catch used for X/Y) so the ElementInfo contains full bounds for highlighting
and hit-testing; keep existing attribute population (ElementTitle, ElementType,
ElementObject) unchanged and mirror the error handling style used for setting
X/Y.

In `@Ginger/GingerCoreNET/Resources/JavaScripts/GingerLiveSpy.js`:
- Around line 146-151: The condition treating (0,0) as "no coordinates" is
wrong; when using X = +GingerLibLiveSpy.GetXPoint() and Y =
+GingerLibLiveSpy.GetYPoint(), replace the falsy check (!X || !Y) with a NaN
check (e.g., Number.isNaN(X) || Number.isNaN(Y) or isNaN(X) || isNaN(Y)) so only
undefined/invalid coordinates fall back to CurrentFocusedElement; update the
conditional around GingerLibLiveSpy.GetXPoint/GetYPoint accordingly.