Merge remote-tracking branch 'origin/master' into tizen

diff --git a/.github/workflows/build-branches.yml b/.github/workflows/build-branches.yml
index a92c8ad..74f7cfc 100644 (file)
--- a/.github/workflows/build-branches.yml
+++ b/.github/workflows/build-branches.yml
@@ -44,7 +44,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: TizenAPI/tizenfx-api-specs
-        token: ${{ secrets.TIZENAPI_GITHUB_TOKEN }}
+        token: ${{ secrets.TIZENAPI_GITHUB_TOKEN_FINEGRAINED }}
         path: .apispec
     
     - name: Push to APISpec

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 2bad9f9..caf1d17 100644 (file)
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -36,7 +36,7 @@ jobs:
         TARGETS: ${{ steps.find-targets.outputs.targets }}
         WORKFLOW_NAME: 'Deploy Packages'
       with:
-        github-token: ${{ secrets.TIZENAPI_GITHUB_TOKEN }}
+        github-token: ${{ secrets.TIZENAPI_GITHUB_TOKEN_FINEGRAINED }}
         script: |
           var resp = await github.request('GET /repos/{owner}/{repo}/actions/workflows', {
             owner: context.repo.owner,

diff --git a/.github/workflows/postback-pull-request.yml b/.github/workflows/postback-pull-request.yml
index 0841b00..0df3348 100644 (file)
--- a/.github/workflows/postback-pull-request.yml
+++ b/.github/workflows/postback-pull-request.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Download Artifacts from Build
       uses: TizenAPI/tizenfx-build-actions/download-workflow-artifacts@master
       with:
-        token: ${{ secrets.TIZENAPI_GITHUB_TOKEN }}
+        token: ${{ secrets.TIZENAPI_GITHUB_TOKEN_FINEGRAINED }}
         run-id: ${{ github.event.workflow_run.id }}
         name: reports
         path: Artifacts
@@ -45,7 +45,7 @@ jobs:
       env:
         PR_NUMBER: ${{ steps.pull_request.outputs.number }}
       with:
-        github-token: ${{ secrets.TIZENAPI_GITHUB_TOKEN }}
+        github-token: ${{ secrets.TIZENAPI_GITHUB_TOKEN_FINEGRAINED }}
         script: |
           const fs = require('fs');
           const json = fs.readFileSync('Artifacts/errors.json', 'utf8');
@@ -61,6 +61,6 @@ jobs:
       if: ${{ github.event.workflow_run.conclusion == 'success' }}
       uses: TizenAPI/tizenfx-build-actions/apidb-report@master
       with:
-        token: ${{ secrets.TIZENAPI_GITHUB_TOKEN }}
+        token: ${{ secrets.TIZENAPI_GITHUB_TOKEN_FINEGRAINED }}
         issue-number: ${{ steps.pull_request.outputs.number }}
         path: Artifacts/api-comp.json

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
index 674586b..0b9ee80 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
@@ -256,7 +256,7 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AccessibilityStates GetAccessibilityStates()
         {
-            var result = new AccessibilityStates {BitMask = Interop.ControlDevel.DaliToolkitDevelControlGetAccessibilityStates(SwigCPtr)};
+            var result = new AccessibilityStates { BitMask = Interop.ControlDevel.DaliToolkitDevelControlGetAccessibilityStates(SwigCPtr) };
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return result;
         }
@@ -353,7 +353,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return new AccessibilityEvents {Owner = this};
+                return new AccessibilityEvents { Owner = this };
             }
         }
 
@@ -388,6 +388,40 @@ namespace Tizen.NUI.BaseComponents
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
+        protected override void Dispose(bool disposing)
+        {
+            if (disposed)
+            {
+                return;
+            }
+
+            internalName = null;
+
+            if (SwigCPtr.Handle != IntPtr.Zero && global::System.Threading.Thread.CurrentThread.ManagedThreadId == Registry.Instance.SavedApplicationThread.ManagedThreadId)
+            {
+                Interop.ControlDevel.DaliAccessibilityDetachAccessibleObject(SwigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            if (disposing == false)
+            {
+                if (IsNativeHandleInvalid() || SwigCMemOwn == false)
+                {
+                    // at this case, implicit nor explicit dispose is not required. No native object is made.
+                    disposed = true;
+                    return;
+                }
+            }
+
+            if (disposing)
+            {
+                Unparent();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
         protected static readonly string AccessibilityActivateAction = "activate";
         [EditorBrowsable(EditorBrowsableState.Never)]
         protected static readonly string AccessibilityReadingSkippedAction = "ReadingSkipped";

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
index f37ef41..5e9a007 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
@@ -1346,12 +1346,6 @@ namespace Tizen.NUI.BaseComponents
 
             disposeDebugging(type);
 
-            internalName = "";
-            Unparent();
-
-            Interop.ControlDevel.DaliAccessibilityDetachAccessibleObject(SwigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
             //_mergedStyle = null;
 
             internalMaximumSize?.Dispose();