Revert "[Packagemanager] Fix registering internal event callback (#2477)" (#2479)
authorjeremy-jang <35089715+jeremy-jang@users.noreply.github.com>
Wed, 30 Dec 2020 07:37:12 +0000 (16:37 +0900)
committerGitHub <noreply@github.com>
Wed, 30 Dec 2020 07:37:12 +0000 (16:37 +0900)
This reverts commit 32bcccffca94e9f7a55d316a78b6273730e56371.

src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs

index 89a9968..d6b57a3 100755 (executable)
@@ -43,7 +43,7 @@ namespace Tizen.Applications
         private static event EventHandler<PackageManagerEventArgs> s_clearDataEventHandler;
 
         private static readonly object s_pkgEventLock = new object();
-        private static Interop.PackageManager.PackageManagerEventCallback s_packageManagerEventCallback;
+        private static Interop.PackageManager.PackageManagerEventCallback s_packageManagerEventCallback = new Interop.PackageManager.PackageManagerEventCallback(InternalEventCallback);
 
         private static Dictionary<IntPtr, Interop.PackageManager.PackageManagerTotalSizeInfoCallback> s_totalSizeInfoCallbackDict = new Dictionary<IntPtr, Interop.PackageManager.PackageManagerTotalSizeInfoCallback>();
         private static int s_callbackId = 0;
@@ -1290,10 +1290,13 @@ namespace Tizen.Applications
             {
                 lock (Handle)
                 {
-                    if (s_packageManagerEventCallback != null)
-                        return;
+                    Log.Debug(LogTag, "Reset Package Event");
+                    err = Interop.PackageManager.PackageManagerUnsetEvent(Handle);
+                    if (err != Interop.PackageManager.ErrorCode.None)
+                    {
+                        throw PackageManagerErrorFactory.GetException(err, "Failed to unregister package manager event event.");
+                    }
 
-                    s_packageManagerEventCallback = new Interop.PackageManager.PackageManagerEventCallback(InternalEventCallback);
                     err = Interop.PackageManager.PackageManagerSetEvent(Handle, s_packageManagerEventCallback, IntPtr.Zero);
                 }
             }
@@ -1358,7 +1361,6 @@ namespace Tizen.Applications
                 {
                     throw PackageManagerErrorFactory.GetException(err, "Failed to unregister package manager event event.");
                 }
-                s_packageManagerEventCallback = null;
             }
         }
     }