Bug fix about invalid parsing and modify sconscript.

this patch include,
1. Bug fix about invalid parsing in jni side
   and send notification was changed to once call.
2. Modify sconscript for android 6.0 devices

Change-Id: I9ae6d68ebf24d944e896db54949f86de62fc0f6e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index c4390a010a05aeabc5303318c258ff4459da6d35..0a45f613ff56a73b71298fa679fb3bd2a8972ef1 100755 (executable)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -70,6 +70,9 @@ if target_os == 'linux':
 if target_os == 'android':
        notification_env.AppendUnique(CCFLAGS = ['-frtti', '-fexceptions'])
        notification_env.AppendUnique(LIBS = ['gnustl_shared','log'])
+       notification_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libnotification_provider.so'])
+       notification_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libnotification_consumer.so'])
+       
 
        if not env.get('RELEASE'):
                notification_env.AppendUnique(LIBS = ['log'])

diff --git a/service/notification/android/notification-service/src/main/jni/provider/JniNotificationProvider.cpp b/service/notification/android/notification-service/src/main/jni/provider/JniNotificationProvider.cpp
index bfe78dbe4b06627c05a93b94bcb6fe15f467db75..bbe00939185e88234d95e8d764b457dd4d9f7e7d 100755 (executable)
--- a/service/notification/android/notification-service/src/main/jni/provider/JniNotificationProvider.cpp
+++ b/service/notification/android/notification-service/src/main/jni/provider/JniNotificationProvider.cpp
@@ -124,9 +124,9 @@ OIC::Service::NSMessage *getNativeMessage(JNIEnv *env, jobject jMsg)
         LOGE("Error: jfieldID for message ttl is null");
         return nullptr;
     }
-    jlong jttl = (jlong) env->GetObjectField( jMsg, fid_ttl);
-    uint64_t  ttl = jttl;
 
+    jlong jttl = (jlong) env->GetLongField( jMsg, fid_ttl);
+    uint64_t  ttl = jttl;
     LOGD("Message ID: %lld\n", ttl);
 
     // Message Title

diff --git a/service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/MainActivity.java b/service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/MainActivity.java
index 481f74e63ca4b14486782b485620a482209034db..5d033fc003f5be3cd65aaf5b5b60e6488f3f0ca8 100755 (executable)
--- a/service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/MainActivity.java
+++ b/service/notification/examples/android/NotiProviderExample/app/src/main/java/com/sec/notiproviderexample/MainActivity.java
@@ -262,13 +262,6 @@ public class MainActivity extends Activity {
                     Log.i(TAG, "#" + notiId + " notified ..");\r
                     TvLog.append("Send Notitication(Msg ID: " + notiId + ")\n");\r
                     notiId++;\r
-                    org.iotivity.service.ns.common.Message notiMessage = new org.iotivity.service.ns.common.Message(title,body,"provider");\r
-                    notiMessage.setTTL(10);\r
-                    notiMessage.setTime(DateFormat.getDateTimeInstance().format(new Date()));\r
-                    notiMessage.setTopic(topic);\r
-                    MediaContents media = new MediaContents("Video");\r
-                    notiMessage.setMediaContents(media);\r
-                    mProviderSample.SendMessage(notiMessage);\r
                 }\r
                 break;\r
 \r