Change implemenation focus app pid

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I6e57f3669068368198e828d93323a7824a37babd

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index ee2850a2c7c8284f2c33bfd15f56ccb34eb8ccd6..af42b49bd96c6d8613ea7f491e59dd44f3f844da 100755 (executable)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -1,6 +1,6 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:    0.1.145
+Version:    0.1.146
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Flora-1.1

diff --git a/src/manager/net_nfc_app_util.c b/src/manager/net_nfc_app_util.c
index 795adc371bb519bd2be61fbe541032084b3e1ec4..f3ba93e5731e696d3e9cfbc5bd0d2da1d521cf81 100755 (executable)
--- a/src/manager/net_nfc_app_util.c
+++ b/src/manager/net_nfc_app_util.c
@@ -29,6 +29,7 @@
 #include <openssl/evp.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
+#include <systemd/sd-login.h>
 
 #include <bundle_internal.h>
 #include "appsvc.h"
@@ -1096,17 +1097,74 @@ int net_nfc_app_util_decode_base64(const char *buffer, uint32_t buf_len, uint8_t
        return ret;
 }
 
+static int __find_login_user(uid_t *uid)
+{
+       uid_t *uids;
+       int ret, i;
+       char *state;
+
+       ret = sd_get_uids(&uids);
+       if (ret <= 0)
+               return -1;
+
+       for (i = 0; i < ret ; i++) {
+               if (sd_uid_get_state(uids[i], &state) < 0) {
+                       free(uids);
+                       return -1;
+               } else {
+                       if (!strncmp(state, "online", 6)) {
+                               *uid = uids[i];
+                               free(uids);
+                               free(state);
+                               return 0;
+                       }
+               }
+       }
+
+       free(uids);
+       free(state);
+       return -1;
+}
+
+int _iter_func(const aul_app_info *info, void *data)
+{
+       uid_t uid = 0;
+       int *pid = (int *)data;
+       int status;
+
+       if(__find_login_user(&uid) < 0) {
+               DEBUG_ERR_MSG("__find_login_user is failed");
+               return 0;
+       }
+
+       status = aul_app_get_status_bypid_for_uid(info->pid, uid);
+
+       if(status == STATUS_VISIBLE || status == STATUS_FOCUS) {
+               *pid = info->pid;
+               return -1;
+       }
+       return 0;
+}
+
 pid_t net_nfc_app_util_get_focus_app_pid()
 {
-/* Todo : ecore_x_window_focus_get is failed
-       ecore_x_init(":0");
+       int ret;
+       uid_t uid = 0;
+       int pid = 0;
 
-       focus = ecore_x_window_focus_get();
-       if (ecore_x_netwm_pid_get(focus, &pid))
-               return pid;
-*/
+       if(__find_login_user(&uid) < 0) {
+               DEBUG_ERR_MSG("__find_login_user is failed");
+               return -1;
+       }
 
-       return -1;
+       ret = aul_app_get_all_running_app_info_for_uid(_iter_func, &pid, uid);
+
+       if (ret == AUL_R_OK) {
+               return pid;
+       } else {
+               DEBUG_ERR_MSG("aul_app_get_all_running_app_info_for_uid is failed");
+               return -1;
+       }
 }
 
 bool net_nfc_app_util_check_launch_state()