From 42deba69d892fee7115de7706c02bd8ab9df25b3 Mon Sep 17 00:00:00 2001
From: "jaesick.shin" <jaesick.shin@samsung.com>
Date: Mon, 8 Aug 2016 09:51:43 +0900
Subject: [PATCH] Modify about Provider Configuration.

1. NSStartProvider API modify arguments in proivder side.
2. comments out about jni, unittest in SConscript.

Change-Id: I5d890690f472c4ff9e1ffa22772ddf658d2dca4c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
---
 service/notification/SConscript                       | 10 +++++-----
 .../examples/linux/notificationprovider.c             | 19 +++++++++++++++++--
 service/notification/include/NSProviderInterface.h    |  4 +---
 .../notification/src/provider/NSProviderInterface.c   | 11 +++++------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/service/notification/SConscript b/service/notification/SConscript
index e2ac640..957d4e3 100644
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -111,15 +111,15 @@ notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\
 	'service/notification', 'NSConsumerInterface.h')
 
 # Go to build Unit test
-if target_os == 'linux':
- SConscript('unittest/SConscript')
+#if target_os == 'linux':
+ #SConscript('unittest/SConscript')
 
 # Go to build sample apps
 SConscript('examples/SConscript')
 
 # Go to build jni
-if target_os == 'android':
-    SConscript('android/SConscript')
+#if target_os == 'android':
+#    SConscript('android/SConscript')
 
  # Go to build c++ wrapper
-SConscript('cpp-wrapper/SConscript')
\ No newline at end of file
+#SConscript('cpp-wrapper/SConscript')
\ No newline at end of file
diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index 105ef7c..ab2427c 100644
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -156,12 +156,27 @@ int main()
         switch (num)
         {
             case 1:
+            {
                 printf("NSStartProvider(Accepter: Provider)");
-                NSStartProvider(true, subscribeRequestCallback, syncCallback);
+                NSProviderConfig config;
+                config.policy = false;
+                config.subRequestCallback = subscribeRequestCallback;
+                config.syncInfoCallback = syncCallback;
+                config.userInfo = OICStrdup("OCF_NOTIFICATION");
+                NSStartProvider(config);
+            }
                 break;
+
             case 2:
+            {
                 printf("NSStartProvider(Accepter: Consumer)");
-                NSStartProvider(false, subscribeRequestCallback, syncCallback);
+                NSProviderConfig config;
+                config.policy = false;
+                config.subRequestCallback = subscribeRequestCallback;
+                config.syncInfoCallback = syncCallback;
+                config.userInfo = OICStrdup("OCF_NOTIFICATION");
+                NSStartProvider(config);
+            }
                 break;
             case 3:
                 printf("NSSendNotification()");
diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProviderInterface.h
index 6163d34..f7e4704 100644
--- a/service/notification/include/NSProviderInterface.h
+++ b/service/notification/include/NSProviderInterface.h
@@ -73,9 +73,7 @@ typedef struct
  * @param[in]  config   Refer to NSProviderConfig
  * @return ::NS_OK or result code of NSResult
  */
-//TODO next commit, change to NSProviderConfig ..
-NSResult NSStartProvider(bool policy, NSSubscribeRequestCallback subscribeRequestCb,
-        NSProviderSyncInfoCallback syncCb);
+NSResult NSStartProvider(NSProviderConfig config);
 
 /**
  * Terminate notification service for provider
diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 95c4662..c91f03d 100644
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -42,8 +42,7 @@ void initializeMutex()
     nsInitMutex = initMutex;
 }
 
-NSResult NSStartProvider(bool policy, NSSubscribeRequestCallback subscribeRequestCb,
-        NSProviderSyncInfoCallback syncCb)
+NSResult NSStartProvider(NSProviderConfig config)
 {
     NS_LOG(DEBUG, "NSStartProvider - IN");
 
@@ -55,10 +54,10 @@ NSResult NSStartProvider(bool policy, NSSubscribeRequestCallback subscribeReques
     {
         NS_LOG(DEBUG, "Init Provider");
         initProvider = true;
-        NSInitProviderInfo();
-        NSSetSubscriptionAccessPolicy(policy);
-        NSRegisterSubscribeRequestCb(subscribeRequestCb);
-        NSRegisterSyncCb(syncCb);
+        NSInitProviderInfo(config.userInfo);
+        NSSetSubscriptionAccessPolicy(config.policy);
+        NSRegisterSubscribeRequestCb(config.subRequestCallback);
+        NSRegisterSyncCb(config.syncInfoCallback);
         CARegisterNetworkMonitorHandler((CAAdapterStateChangedCB)NSProviderAdapterStateListener,
                 (CAConnectionStateChangedCB)NSProviderConnectionStateListener);
 
-- 
2.7.4