From e9e9ceaf14936218a4b0ed0082b0a049f1089f8b Mon Sep 17 00:00:00 2001
From: Jiyun Yang <ji.yang@samsung.com>
Date: Tue, 9 Mar 2021 12:35:39 +0900
Subject: [PATCH] [NUI] Fix AccessibilityManager's unsafe conversion to View
 from IntPtr (#2717)

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
---
 .../src/public/Accessibility/AccessibilityManager.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs b/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs
index 6c91a3f..0b66bb2 100755
--- a/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs
+++ b/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs
@@ -438,9 +438,9 @@ namespace Tizen.NUI.Accessibility
         [EditorBrowsable(EditorBrowsableState.Never)]
         public View GetViewByFocusOrder(uint order)
         {
-            View ret = new View(Interop.AccessibilityManager.GetActorByFocusOrder(SwigCPtr, order), true);
+            var ptr = Interop.AccessibilityManager.GetActorByFocusOrder(SwigCPtr, order);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            return this.GetInstanceSafely<View>(ptr);
         }
 
         /// <summary>
@@ -469,9 +469,9 @@ namespace Tizen.NUI.Accessibility
         [EditorBrowsable(EditorBrowsableState.Never)]
         public View GetCurrentFocusView()
         {
-            View ret = new View(Interop.AccessibilityManager.GetCurrentFocusActor(SwigCPtr), true);
+            var ptr = Interop.AccessibilityManager.GetCurrentFocusActor(SwigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            return this.GetInstanceSafely<View>(ptr);
         }
 
         /// <summary>
@@ -483,9 +483,9 @@ namespace Tizen.NUI.Accessibility
         [EditorBrowsable(EditorBrowsableState.Never)]
         public View GetCurrentFocusGroup()
         {
-            View ret = new View(Interop.AccessibilityManager.GetCurrentFocusGroup(SwigCPtr), true);
+            var ptr = Interop.AccessibilityManager.GetCurrentFocusGroup(SwigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            return this.GetInstanceSafely<View>(ptr);
         }
 
         /// <summary>
@@ -669,9 +669,9 @@ namespace Tizen.NUI.Accessibility
         [EditorBrowsable(EditorBrowsableState.Never)]
         public View GetFocusIndicatorView()
         {
-            View ret = new View(Interop.AccessibilityManager.GetFocusIndicatorActor(SwigCPtr), true);
+            var ptr = Interop.AccessibilityManager.GetFocusIndicatorActor(SwigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            return this.GetInstanceSafely<View>(ptr);
         }
 
         /// <summary>
@@ -684,9 +684,9 @@ namespace Tizen.NUI.Accessibility
         [EditorBrowsable(EditorBrowsableState.Never)]
         public View GetFocusGroup(View view)
         {
-            View ret = new View(Interop.AccessibilityManager.GetFocusGroup(SwigCPtr, View.getCPtr(view)), true);
+            var ptr = Interop.AccessibilityManager.GetFocusGroup(SwigCPtr, View.getCPtr(view));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            return this.GetInstanceSafely<View>(ptr);
         }
 
         /// <summary>
-- 
2.7.4