[IOT-1591] Add warning code as notification type

It is required to notification message with warning type.

Change-Id: I8ea23690382a0f32d084ce3ed9903971f2a4c390
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit d2671aafa1c61b98b2e20fbef0d9c57957526d17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14989
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/service/notification/android/notification-service/src/main/java/org/iotivity/service/ns/common/Message.java b/service/notification/android/notification-service/src/main/java/org/iotivity/service/ns/common/Message.java
index e0e2407..f2f2057 100755 (executable)
--- a/service/notification/android/notification-service/src/main/java/org/iotivity/service/ns/common/Message.java
+++ b/service/notification/android/notification-service/src/main/java/org/iotivity/service/ns/common/Message.java
@@ -33,10 +33,11 @@ public class Message
 
     public enum MessageType
     {
-        ALERT(0),
-        NOTICE(1),
-        EVENT(2),
-        INFO(3);
+        ALERT(1),
+        NOTICE(2),
+        EVENT(3),
+        INFO(4),
+        WARNING(5);
         private int type;
 
         private MessageType(int type)

diff --git a/service/notification/cpp-wrapper/common/NSMessage.h b/service/notification/cpp-wrapper/common/NSMessage.h
index b24ad2f..ae17131 100755 (executable)
--- a/service/notification/cpp-wrapper/common/NSMessage.h
+++ b/service/notification/cpp-wrapper/common/NSMessage.h
@@ -45,10 +45,11 @@ namespace OIC
                 /** NSMessageType - enumeration for Notification service MessageType*/\r
                 enum class NSMessageType\r
                 {\r
-                    NS_MESSAGE_ALERT = 0,\r
-                    NS_MESSAGE_NOTICE = 1,\r
-                    NS_MESSAGE_EVENT = 2,\r
-                    NS_MESSAGE_INFO = 3,\r
+                    NS_MESSAGE_ALERT = 1,\r
+                    NS_MESSAGE_NOTICE = 2,\r
+                    NS_MESSAGE_EVENT = 3,\r
+                    NS_MESSAGE_INFO = 4,\r
+                    NS_MESSAGE_WARNING = 5,\r
                 };\r
 \r
                 /**\r

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index 9f6e35c..9fd4266 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -81,6 +81,7 @@ typedef enum
     NS_MESSAGE_NOTICE = 2,
     NS_MESSAGE_EVENT = 3,
     NS_MESSAGE_INFO = 4,
+    NS_MESSAGE_WARNING = 5,
 
 } NSMessageType;