From 95c4013d1f309c628c1a76aa6f628a4463d6cc0d Mon Sep 17 00:00:00 2001
From: Seungkeun Lee <sngn.lee@samsung.com>
Date: Thu, 7 Apr 2016 10:09:03 +0900
Subject: [PATCH] ApplicationManager : Remove redundant code using inheritance

 - InstalledApplicationMetadataFilter was inherited from InstalledApplicationFilter
 - Add Extension to create native filter handle (appinfo/metadata)
 - Reuse Callback handler

Change-Id: I3bf55b4bc428eacebf95a1b56d91ae5fa61d518e
---
 .../ApplicationManagerImpl.cs                      | 87 ++++++++++------------
 .../InstalledApplicationMetadataFilter.cs          |  7 +-
 2 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs b/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs
index ca5d163..3fb98cb 100755
--- a/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs
+++ b/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs
@@ -112,46 +112,8 @@ namespace Tizen.Applications.Managers
                     if (handle != IntPtr.Zero)
                     {
                         IntPtr clonedHandle = IntPtr.Zero;
-                        int result = Interop.ApplicationManager.AppInfoClone(out clonedHandle, handle);
-                        if (result != 0)
-                        {
-                            return false;
-                        }
-                        InstalledApplication app = new InstalledApplication(clonedHandle);
-                        Result.Add(app);
-                        return true;
-                    }
-                    return false;
-                };
-
-                IntPtr appInfoFilter = MakeNativeAppInfoFilter(filter.Filter);
-                int ret = Interop.ApplicationManager.AppInfoFilterForeachAppinfo(appInfoFilter, cb, IntPtr.Zero);
-                if (appInfoFilter != IntPtr.Zero)
-                    Interop.ApplicationManager.AppInfoFilterDestroy(appInfoFilter);
-                if (ret != 0)
-                {
-                    ApplicationManagerErrorFactory.ExceptionChecker(ret, "GetInstalledAppsAsync(InstalledApplicationFilter) failed.");
-                }
-                return Result;
-            });
-        }
-
-        internal async Task<IEnumerable<InstalledApplication>> GetInstalledAppsAsync(InstalledApplicationMetadataFilter filter)
-        {
-            Log.Debug(LogTag, "GetInstalledAppsAsync(InstalledApplicationMetadataFilter filter)");
-
-            return await Task.Run(() =>
-            {
-                List<InstalledApplication> Result = new List<InstalledApplication>();
-
-                Interop.ApplicationManager.AppInfoFilterCallback cb = (IntPtr handle, IntPtr userData) =>
-                {
-                    Log.Debug(LogTag, "AppInfoFilterCallback");
-                    if (handle != IntPtr.Zero)
-                    {
-                        IntPtr clonedHandle = IntPtr.Zero;
-                        int result = Interop.ApplicationManager.AppInfoClone(out clonedHandle, handle);
-                        if (result != 0)
+                        int ret = Interop.ApplicationManager.AppInfoClone(out clonedHandle, handle);
+                        if (ret != 0)
                         {
                             return false;
                         }
@@ -161,18 +123,10 @@ namespace Tizen.Applications.Managers
                     }
                     return false;
                 };
-                IntPtr appMedataFilter = MakeNativeAppMetadataFilter(filter.Filter);
-                int ret = Interop.ApplicationManager.AppInfoMetadataFilterForeach(appMedataFilter, cb, IntPtr.Zero);
-                if (appMedataFilter != IntPtr.Zero)
-                    Interop.ApplicationManager.AppInfoMetadataFilterDestroy(appMedataFilter);
-                if (ret != 0)
-                {
-                    ApplicationManagerErrorFactory.ExceptionChecker(ret, "GetInstalledAppsAsync(InstalledApplicationMetadataFilter) failed.");
-                }
+                filter.Fetch(cb);
                 return Result;
             });
         }
-
         internal async Task<IEnumerable<RunningApplication>> GetRunningAppsAsync()
         {
             Log.Debug(LogTag, "GetRunningAppsAsync()");
@@ -352,6 +306,41 @@ namespace Tizen.Applications.Managers
             Log.Debug(LogTag, "UnRegisterApplicationChangedEvent()");
             Interop.ApplicationManager.AppManagerUnSetAppContextEvent();
         }
+    }
+    internal static class FilterExtension
+    {
+        private const string LogTag = "Tizen.Applications.Managers";
+        internal static void Fetch(this InstalledApplicationFilter filter, Interop.ApplicationManager.AppInfoFilterCallback callback)
+        {
+            if (filter is InstalledApplicationMetadataFilter)
+            {
+                InstalledApplicationMetadataFilter metaFilter = (InstalledApplicationMetadataFilter)filter;
+                metaFilter.Fetch(callback);
+                return;
+            }
+
+            IntPtr nativeHandle = MakeNativeAppInfoFilter(filter.Filter);
+            int ret = Interop.ApplicationManager.AppInfoFilterForeachAppinfo(nativeHandle, callback, IntPtr.Zero);
+            if (nativeHandle != IntPtr.Zero)
+                Interop.ApplicationManager.AppInfoFilterDestroy(nativeHandle);
+            if (ret != 0)
+            {
+                ApplicationManagerErrorFactory.ExceptionChecker(ret, "GetInstalledAppsAsync(InstalledApplicationFilter) failed.");
+            }
+        }
+
+        internal static void Fetch(this InstalledApplicationMetadataFilter filter, Interop.ApplicationManager.AppInfoFilterCallback callback)
+        {
+            IntPtr nativeHandle = MakeNativeAppMetadataFilter(filter.Filter);
+            int ret = Interop.ApplicationManager.AppInfoMetadataFilterForeach(nativeHandle, callback, IntPtr.Zero);
+            if (nativeHandle != IntPtr.Zero)
+                Interop.ApplicationManager.AppInfoMetadataFilterDestroy(nativeHandle);
+            if (ret != 0)
+            {
+                ApplicationManagerErrorFactory.ExceptionChecker(ret, "GetInstalledAppsAsync(InstalledApplicationMetadataFilter) failed.");
+            }
+        }
+
 
         private static IntPtr MakeNativeAppInfoFilter(IDictionary<string, string> filter)
         {
diff --git a/Tizen.Applications/Tizen.Applications.Managers/InstalledApplicationMetadataFilter.cs b/Tizen.Applications/Tizen.Applications.Managers/InstalledApplicationMetadataFilter.cs
index 59093d8..1d460b5 100755
--- a/Tizen.Applications/Tizen.Applications.Managers/InstalledApplicationMetadataFilter.cs
+++ b/Tizen.Applications/Tizen.Applications.Managers/InstalledApplicationMetadataFilter.cs
@@ -15,12 +15,7 @@ namespace Tizen.Applications.Managers
     /// <summary>
     /// InstalledApplicationMetadataFilter class. This class is a parameter of InstallerApplicationAppsAsync method.
     /// </summary>
-    public class InstalledApplicationMetadataFilter
+    public class InstalledApplicationMetadataFilter : InstalledApplicationFilter
     {
-        public IDictionary<string, string> Filter
-        {
-            get;
-            set;
-        }
     }
 }
-- 
2.7.4