From 54a75d56fb9cb986eb8fc1477d7a0b8c07a11fc8 Mon Sep 17 00:00:00 2001 From: Lee Hyuk Date: Thu, 8 Dec 2016 09:59:30 +0900 Subject: [PATCH 01/16] Fix the crash issue (TSAM-10987) Change-Id: I932f8556fda60f1079bad0838a7cd86fe74e8ffc Signed-off-by: Lee Hyuk --- src/bt-share-ui-view.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bt-share-ui-view.c b/src/bt-share-ui-view.c index 89e2bf3..36ba544 100644 --- a/src/bt-share-ui-view.c +++ b/src/bt-share-ui-view.c @@ -267,8 +267,8 @@ static Eina_Bool __bt_back_button_cb(void *data, Elm_Object_Item *it) return EINA_FALSE; } -static Evas_Object *__bt_tr_progress_icon_get(void *data, Evas_Object *obj, - const char *part) +static Evas_Object *__bt_tr_reusable_progress_icon_get(void *data, Evas_Object *obj, + const char *part, Evas_Object *old) { FN_START; @@ -347,7 +347,6 @@ static Evas_Object *__bt_tr_progress_icon_get(void *data, Evas_Object *obj, return progress_layout; } - static Evas_Object *__bt_tr_icon_get(void *data, Evas_Object *obj, const char *part) { @@ -1322,7 +1321,7 @@ static Evas_Object *__bt_add_tr_data_genlist(Evas_Object *parent, if (ad->tr_progress_itc) { ad->tr_progress_itc->item_style = "full"; ad->tr_progress_itc->func.text_get = NULL; - ad->tr_progress_itc->func.content_get = __bt_tr_progress_icon_get; + ad->tr_progress_itc->func.reusable_content_get = __bt_tr_reusable_progress_icon_get; ad->tr_progress_itc->func.state_get = NULL; ad->tr_progress_itc->func.del = NULL; } -- 2.7.4 From 12d4f0a5eb7e6d61ba760a497c06419fd80df342 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Mon, 2 Jan 2017 18:37:13 +0900 Subject: [PATCH 02/16] Remove Profile Build Dependency: trivial Do not restrict build based on profile. If this package is not need by a specific profile, please remove it from its image (via TRE-JIRA). However, it is already removed from other profile images. Change-Id: I76a6282174c81cf5512bf2833befaac64377ace1 Signed-off-by: MyungJoo Ham --- packaging/org.tizen.bluetooth-share-ui.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec index 46378c3..56a6fa9 100755 --- a/packaging/org.tizen.bluetooth-share-ui.spec +++ b/packaging/org.tizen.bluetooth-share-ui.spec @@ -9,10 +9,6 @@ Group: TO_BE_FILLED License: Flora-1.1 Source0: %{name}-%{version}.tar.gz -%if "%{?profile}" != "mobile" -ExcludeArch: %{arm} aarch64 %ix86 x86_64 -%endif - BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) -- 2.7.4 From fb67efbd6bffd8a8ee5c8302e58b8614e69fccff Mon Sep 17 00:00:00 2001 From: Lee Hyuk Date: Fri, 16 Dec 2016 10:10:40 +0900 Subject: [PATCH 03/16] Fix the crash issue (TSAM-11668,11658) Change-Id: I24d228026c5fac0d14a88136f1da3cb5fd7079c9 Signed-off-by: Lee Hyuk --- src/bt-share-ui-view.c | 59 +++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/src/bt-share-ui-view.c b/src/bt-share-ui-view.c index 36ba544..c380042 100644 --- a/src/bt-share-ui-view.c +++ b/src/bt-share-ui-view.c @@ -267,8 +267,8 @@ static Eina_Bool __bt_back_button_cb(void *data, Elm_Object_Item *it) return EINA_FALSE; } -static Evas_Object *__bt_tr_reusable_progress_icon_get(void *data, Evas_Object *obj, - const char *part, Evas_Object *old) +static Evas_Object *__bt_tr_progress_icon_get(void *data, Evas_Object *obj, + const char *part) { FN_START; @@ -285,37 +285,28 @@ static Evas_Object *__bt_tr_reusable_progress_icon_get(void *data, Evas_Object * char buff[BT_STR_PROGRESS_MAX_LEN] = { 0, }; char *markup_text = NULL; - if (ad->progress_layout == NULL) { - DBG("Creating new progress layout!!!"); - progress_layout = elm_layout_add(obj); - elm_layout_file_set(progress_layout, EDJFILE, "popup_text_progressbar_view_layout"); - evas_object_size_hint_align_set(progress_layout, EVAS_HINT_FILL, - EVAS_HINT_FILL); - evas_object_size_hint_weight_set(progress_layout, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_show(progress_layout); - ad->progress_layout = progress_layout; - } else { - progress_layout = ad->progress_layout; - } - - if (ad->progressbar == NULL) { - DBG("Creating new progressbar!!!"); - progressbar = elm_progressbar_add(progress_layout); - - elm_progressbar_unit_format_set(progressbar, NULL); - elm_progressbar_horizontal_set(progressbar, EINA_TRUE); - evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, - EVAS_HINT_FILL); - evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - elm_progressbar_pulse(progressbar, EINA_TRUE); - - evas_object_show(progressbar); - ad->progressbar = progressbar; - } else { - progressbar = ad->progressbar; - } + DBG("Creating new progress layout!!!"); + progress_layout = elm_layout_add(obj); + elm_layout_file_set(progress_layout, EDJFILE, "popup_text_progressbar_view_layout"); + evas_object_size_hint_align_set(progress_layout, EVAS_HINT_FILL, + EVAS_HINT_FILL); + evas_object_size_hint_weight_set(progress_layout, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_show(progress_layout); + + DBG("Creating new progressbar!!!"); + progressbar = elm_progressbar_add(progress_layout); + + elm_progressbar_unit_format_set(progressbar, NULL); + elm_progressbar_horizontal_set(progressbar, EINA_TRUE); + evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, + EVAS_HINT_FILL); + evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + elm_progressbar_pulse(progressbar, EINA_TRUE); + + evas_object_show(progressbar); + ad->progressbar = progressbar; markup_text = elm_entry_utf8_to_markup(transfer_info->filename); DBG_SECURE("Filename: %s", markup_text); @@ -1321,7 +1312,7 @@ static Evas_Object *__bt_add_tr_data_genlist(Evas_Object *parent, if (ad->tr_progress_itc) { ad->tr_progress_itc->item_style = "full"; ad->tr_progress_itc->func.text_get = NULL; - ad->tr_progress_itc->func.reusable_content_get = __bt_tr_reusable_progress_icon_get; + ad->tr_progress_itc->func.content_get = __bt_tr_progress_icon_get; ad->tr_progress_itc->func.state_get = NULL; ad->tr_progress_itc->func.del = NULL; } -- 2.7.4 From e8fb4aef4bffed96916dd2ca10d13a609689cb2a Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 9 Mar 2017 13:32:38 +0900 Subject: [PATCH 04/16] Modify flora license version from 1.0 to 1.1 in the source codes Change-Id: Iba1e9b3075461c0b212917187c900b36029bf7ce Signed-off-by: DoHyun Pyun --- src/applog.h | 2 +- src/bt-share-ui-ipc.c | 2 +- src/bt-share-ui-ipc.h | 2 +- src/bt-share-ui-main.c | 2 +- src/bt-share-ui-main.h | 2 +- src/bt-share-ui-popup.c | 2 +- src/bt-share-ui-popup.h | 2 +- src/bt-share-ui-resource.h | 2 +- src/bt-share-ui-view.c | 2 +- src/bt-share-ui-view.h | 2 +- src/bt-share-ui-widget.c | 4 ++-- src/bt-share-ui-widget.h | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/applog.h b/src/applog.h index a2fdffd..e1d3dc7 100644 --- a/src/applog.h +++ b/src/applog.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-ipc.c b/src/bt-share-ui-ipc.c index facf293..c59c0ed 100644 --- a/src/bt-share-ui-ipc.c +++ b/src/bt-share-ui-ipc.c @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-ipc.h b/src/bt-share-ui-ipc.h index 7eedbd2..3b80b7d 100644 --- a/src/bt-share-ui-ipc.h +++ b/src/bt-share-ui-ipc.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-main.c b/src/bt-share-ui-main.c index 889772d..92981a9 100644 --- a/src/bt-share-ui-main.c +++ b/src/bt-share-ui-main.c @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-main.h b/src/bt-share-ui-main.h index cd0881f..4201964 100644 --- a/src/bt-share-ui-main.h +++ b/src/bt-share-ui-main.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-popup.c b/src/bt-share-ui-popup.c index 24516c3..ae28bb4 100644 --- a/src/bt-share-ui-popup.c +++ b/src/bt-share-ui-popup.c @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-popup.h b/src/bt-share-ui-popup.h index 27ed7be..47ab43b 100644 --- a/src/bt-share-ui-popup.h +++ b/src/bt-share-ui-popup.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-resource.h b/src/bt-share-ui-resource.h index ae310b3..0b8c67c 100644 --- a/src/bt-share-ui-resource.h +++ b/src/bt-share-ui-resource.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-view.c b/src/bt-share-ui-view.c index c380042..d736768 100644 --- a/src/bt-share-ui-view.c +++ b/src/bt-share-ui-view.c @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-view.h b/src/bt-share-ui-view.h index d9fa8d4..1d7b6ac 100644 --- a/src/bt-share-ui-view.h +++ b/src/bt-share-ui-view.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-widget.c b/src/bt-share-ui-widget.c index e22e5ca..5ccb182 100644 --- a/src/bt-share-ui-widget.c +++ b/src/bt-share-ui-widget.c @@ -1,5 +1,5 @@ /* -* ug-setting-bluetooth-efl +* bluetooth-share-ui * * Copyright 2012 Samsung Electronics Co., Ltd * @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/src/bt-share-ui-widget.h b/src/bt-share-ui-widget.h index 0fd512d..dfe9ca8 100644 --- a/src/bt-share-ui-widget.h +++ b/src/bt-share-ui-widget.h @@ -7,7 +7,7 @@ * GirishAshok Joshi * DoHyun Pyun * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * -- 2.7.4 From 137606ee2f38fc4f02afab1d50c181bed6c2808d Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Mon, 27 Mar 2017 16:22:12 +0900 Subject: [PATCH 05/16] Modify the install path for license file Change-Id: I3abb260cabc74d423fba5254ae9b3f21230632c6 Signed-off-by: DoHyun Pyun --- packaging/org.tizen.bluetooth-share-ui.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec index 56a6fa9..4ffd2c0 100755 --- a/packaging/org.tizen.bluetooth-share-ui.spec +++ b/packaging/org.tizen.bluetooth-share-ui.spec @@ -63,8 +63,6 @@ PKG_ID=org.tizen.bluetooth-share-ui %define tizen_author_sign 1 %define tizen_dist_sign 1 -install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/org.tizen.bluetooth-share-ui - %post %postun @@ -75,6 +73,7 @@ install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/org.tizen.bluetooth-s %files %manifest bluetooth-share-ui.manifest +%license LICENSE %defattr(-,root,root,-) %{_appdir}/org.tizen.bluetooth-share-ui/res/edje/bt-share-layout.edj %{_appdir}/org.tizen.bluetooth-share-ui/res/edje/images.edj @@ -83,5 +82,4 @@ install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/org.tizen.bluetooth-s %{_appdir}/org.tizen.bluetooth-share-ui/signature1.xml %{_usrdir}/share/icons/default/small/org.tizen.bluetooth-share-ui.png %{_usrdir}/share/packages/org.tizen.bluetooth-share-ui.xml -%{_datadir}/license/org.tizen.bluetooth-share-ui -- 2.7.4 From cb2b75f30ca127a73a7bebfea71e844841044630 Mon Sep 17 00:00:00 2001 From: Hyuk Lee Date: Thu, 27 Apr 2017 20:52:36 +0900 Subject: [PATCH 06/16] Replace the sscanf to strtol Change-Id: I4e66a6316c3a578e162ba1374f1f2282b7259fc0 Signed-off-by: Hyuk Lee --- src/bt-share-ui-main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bt-share-ui-main.c b/src/bt-share-ui-main.c index 92981a9..ff56686 100644 --- a/src/bt-share-ui-main.c +++ b/src/bt-share-ui-main.c @@ -115,6 +115,8 @@ static int __bt_share_launch_handler(bt_share_appdata_t *ad, bundle *b, FN_START; const char *transfer_type = NULL; const char *temp = NULL; + char *ptr = NULL; + char *stop = NULL; unsigned char tranferred; int tr_type = 0; sqlite3 *db = NULL; @@ -201,7 +203,8 @@ static int __bt_share_launch_handler(bt_share_appdata_t *ad, bundle *b, if (temp != NULL) { int current, total; INFO("PROGRESS TEXT: %s", temp); - sscanf(temp, "[%d/%d]", ¤t, &total); + current = strtol(temp + 1, &stop, 10); + total = strtol(stop + 1, &stop, 10); transfer_data->current_file = current; transfer_data->total_files = total; } -- 2.7.4 From e7caf705118bc40f530af15c4d79c0766697399f Mon Sep 17 00:00:00 2001 From: Amit Purwar Date: Mon, 24 Jul 2017 10:32:04 +0530 Subject: [PATCH 07/16] removed the redundant null check Change-Id: Id6b8ebf5254f4f4d3503ace6f7999587a89265a7 Signed-off-by: Amit Purwar --- src/bt-share-ui-popup.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/bt-share-ui-popup.c b/src/bt-share-ui-popup.c index ae28bb4..40e9ddb 100644 --- a/src/bt-share-ui-popup.c +++ b/src/bt-share-ui-popup.c @@ -53,18 +53,16 @@ int _bt_update_progressbar(bt_share_appdata_t *ad, retvm_if(ad->transfer_info == NULL, 0, "Invalid argument: transfer_info is NULL"); retvm_if(ad->transfer_info->transfer_id != transfer_id, 0, "Invalid transfer_id!"); - if (ad->transfer_info) { - ad->transfer_info->percentage = percentage; - if (ad->progress_item && ad->progressbar) { - float i; - i = (float)(percentage) / (float)100.0; - elm_progressbar_value_set(ad->progressbar, i); - - elm_object_part_text_set(ad->progressbar, "elm.text.bottom.left", - g_strdup_printf("%d%%", percentage)); - } - + ad->transfer_info->percentage = percentage; + if (ad->progress_item && ad->progressbar) { + float i; + i = (float)(percentage) / (float)100.0; + elm_progressbar_value_set(ad->progressbar, i); + + elm_object_part_text_set(ad->progressbar, "elm.text.bottom.left", + g_strdup_printf("%d%%", percentage)); } + return 0; } -- 2.7.4 From 862186c31a68e34b4f1901ecb2252ac41b802d48 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 21 Sep 2017 16:03:02 +0900 Subject: [PATCH 08/16] Remove the dbus-glib-1 dependency Change-Id: Ie4f3479549636dde9b748da5afbb879446885485 Signed-off-by: DoHyun Pyun --- CMakeLists.txt | 1 - debian/changelog | 303 ------------------------- debian/compat | 1 - debian/control | 19 -- debian/docs | 0 debian/org.tizen.bluetooth-share-ui.install.in | 5 - debian/rules | 144 ------------ packaging/org.tizen.bluetooth-share-ui.spec | 1 - src/bt-share-ui-ipc.c | 1 - src/bt-share-ui-main.c | 1 - src/bt-share-ui-main.h | 1 - 11 files changed, 477 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/docs delete mode 100644 debian/org.tizen.bluetooth-share-ui.install.in delete mode 100755 debian/rules diff --git a/CMakeLists.txt b/CMakeLists.txt index 29d90e2..ab8e391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ pkg_check_modules(pkgs REQUIRED appcore-efl bundle dlog - dbus-glib-1 ecore edbus edje diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 9ce8633..0000000 --- a/debian/changelog +++ /dev/null @@ -1,303 +0,0 @@ -bluetooth-share-ui (0.0.38) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.38 - - -- InJun Yang Fri, 22 Feb 2013 19:20:37 +0900 - -bluetooth-share-ui (0.0.37) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.37 - - -- DoHyun Pyun Tue, 05 Feb 2013 19:15:09 +0900 - -bluetooth-share-ui (0.0.36) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.36 - - -- InJun Yang Fri, 01 Feb 2013 20:19:22 +0900 - -bluetooth-share-ui (0.0.35) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.35 - - -- DoHyun Pyun Thu, 24 Jan 2013 11:37:34 +0900 - -bluetooth-share-ui (0.0.34) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.34 - - -- Jaganath K Tue, 15 Jan 2013 18:17:28 +0530 - -bluetooth-share-ui (0.0.33) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.33 - - -- Sunil Kumar Behera Wed, 09 Jan 2013 19:49:19 +0900 - -bluetooth-share-ui (0.0.32) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.32 - - -- Sunil Kumar Behera Wed, 26 Dec 2012 15:15:45 +0530 - -bluetooth-share-ui (0.0.31) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.31 - - -- Sunil Kumar Behera Thu, 20 Dec 2012 16:50:02 +0530 - -bluetooth-share-ui (0.0.30) unstable; urgency=low - - * Tagging and package upload - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.30 - - -- Chethan T N Thu, 20 Dec 2012 17:41:51 +0900 - -bluetooth-share-ui (0.0.29) unstable; urgency=low - - * Display the clear button - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.29 - - -- DoHyun Pyun Thu, 15 Nov 2012 15:26:52 +0900 - -bluetooth-share-ui (0.0.28) unstable; urgency=low - - * Upload package for prevent defect fix - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.28 - - -- Chethan T N Fri, 09 Nov 2012 11:39:45 +0900 - -bluetooth-share-ui (0.0.27) unstable; urgency=low - - * Applied screen rotaion and prevent defect fix - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.27 - - -- Chethan T N Thu, 08 Nov 2012 17:44:59 +0900 - -bluetooth-share-ui (0.0.26) unstable; urgency=low - - * Add incicator window - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.26 - - -- InJun Yang Wed, 31 Oct 2012 15:01:01 +0900 - -bluetooth-share-ui (0.0.25) unstable; urgency=low - - * Fix : Retry file send crash issue - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.25 - - -- Chethan T N Fri, 26 Oct 2012 17:44:55 +0530 - -bluetooth-share-ui (0.0.24) unstable; urgency=low - - * Change directory path - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.24 - - -- InJun Yang Thu, 25 Oct 2012 13:58:16 +0900 - -bluetooth-share-ui (0.0.23) unstable; urgency=low - - * Upload the package - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.23 - - -- InJun Yang Fri, 12 Oct 2012 21:51:21 +0900 - -bluetooth-share-ui (0.0.22) unstable; urgency=low - - * Copy the license file in target - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.22 - - -- DoHyun Pyun Thu, 11 Oct 2012 15:52:05 +0900 - -bluetooth-share-ui (0.0.21) unstable; urgency=low - - * Apply smack manifest file - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.21 - - -- Sangki Park Mon, 24 Sep 2012 13:58:42 +0900 - -bluetooth-share-ui (0.0.20) unstable; urgency=low - - * Upload the package - * Git: magnolia/apps/connectivity/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.20 - - -- InJun Yang Thu, 23 Aug 2012 09:37:13 +0900 - -bluetooth-share-ui (0.0.19) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.19 - - -- InJun Yang Fri, 10 Aug 2012 12:26:41 +0900 - -bluetooth-share-ui (0.0.18) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.18 - - -- InJun Yang Tue, 07 Aug 2012 12:57:35 +0900 - -bluetooth-share-ui (0.0.17) unstable; urgency=low - - * Apply pkg manifest - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.17 - - -- InJun Yang Tue, 31 Jul 2012 15:11:49 +0900 - -bluetooth-share-ui (0.0.16) unstable; urgency=low - - * Change text color - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.16 - - -- InJun Yang Tue, 31 Jul 2012 10:11:23 +0900 - -bluetooth-share-ui (0.0.15) unstable; urgency=low - - * Code refactoring - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.15 - - -- InJun Yang Tue, 10 Jul 2012 19:28:09 +0900 - -bluetooth-share-ui (0.0.14) unstable; urgency=low - - * Ordering inbound/outbound view - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.14 - - -- InJun Yang Tue, 10 Jul 2012 08:55:44 +0900 - -bluetooth-share-ui (0.0.13) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.13 - - -- InJun Yang Fri, 06 Jul 2012 20:09:50 +0900 - -bluetooth-share-ui (0.0.12) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.12 - - -- InJun Yang Wed, 20 Jun 2012 20:42:55 +0900 - -bluetooth-share-ui (0.0.11) unstable; urgency=low - - * Remove the progress popup in error case - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.11 - - -- DoHyun Pyun Mon, 04 Jun 2012 09:00:48 +0900 - -bluetooth-share-ui (0.0.10) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.10 - - -- InJun Yang Tue, 29 May 2012 17:45:20 +0900 - -bluetooth-share-ui (0.0.9) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.9 - - -- InJun Yang Thu, 24 May 2012 15:03:56 +0900 - -bluetooth-share-ui (0.0.8) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.8 - - -- DoHyun Pyun Mon, 21 May 2012 14:30:23 +0900 - -bluetooth-share-ui (0.0.7) unstable; urgency=low - - * Support the dynamic font change - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.7 - - -- DoHyun Pyun Mon, 14 May 2012 10:46:32 +0900 - -bluetooth-share-ui (0.0.6) unstable; urgency=low - - * Upload the package - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.6 - - -- InJun Yang Thu, 22 Mar 2012 16:45:01 +0900 - -bluetooth-share-ui (0.0.5) unstable; urgency=low - - * Apply remained EFL changes - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.5 - - -- Hocheol Seo Sat, 17 Mar 2012 14:59:52 +0900 - -bluetooth-share-ui (0.0.4) unstable; urgency=low - - * SLP prefix is changed - * Git: slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.4 - - -- InJun Yang Thu, 15 Mar 2012 18:48:04 +0900 - -bluetooth-share-ui (0.0.3) unstable; urgency=low - - * Apply and upload the Elementary API changes - * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.3 - - -- DoHyun Pyun Tue, 13 Mar 2012 18:53:47 +0530 - -bluetooth-share-ui (0.0.2) unstable; urgency=low - - * Apply the winset API changes - * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.2 - - -- DoHyun Pyun Thu, 16 Feb 2012 10:09:01 +0900 - -bluetooth-share-ui (0.0.1) unstable; urgency=low - - * Initial release - * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share-ui - * Tag: bluetooth-share-ui_0.0.1 - - -- Injun Yang Mon, 10 Oct 2011 16:17:49 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 6264d8c..0000000 --- a/debian/control +++ /dev/null @@ -1,19 +0,0 @@ -Source: bluetooth-share-ui -Section: main -Priority: extra -Maintainer: Hocheol Seo , DoHyun Pyun , InJun Yang , Chanyeol Park -Uploaders: Sunil Behera , Syam Sidhardhan -Build-Depends: debhelper (>= 5),libevas-dev, libecore-dev, libelm-dev, libappcore-efl-dev, libslp-utilx-dev, dlog-dev, libdbus-glib-1-dev, libglib2.0-dev, libaul-1-dev, libbluetooth-frwk-dev (>= 0.1.0), capi-appfw-application-dev, libbluetooth-share-dev -Standards-Version: 0.1.0 - -Package: org.tizen.bluetooth-share-ui -Section: main -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libslp-utilx-0, libdlog-0 -Description: bluetooth share UI application - -Package: org.tizen.bluetooth-share-ui-dbg -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: bluetooth share UI application (unstripped) diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e69de29..0000000 diff --git a/debian/org.tizen.bluetooth-share-ui.install.in b/debian/org.tizen.bluetooth-share-ui.install.in deleted file mode 100644 index a20de48..0000000 --- a/debian/org.tizen.bluetooth-share-ui.install.in +++ /dev/null @@ -1,5 +0,0 @@ -@PREFIX@/bin/bluetooth-share-ui -@RESDIR@/edje/* -@RESDIR@/images/* -/opt/share/applications/org.tizen.bluetooth-share-ui.desktop -/opt/share/icons/default/small/* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index c7f02cf..0000000 --- a/debian/rules +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -CFLAGS ?= -Wall -g -CXXFLAGS ?= -Wall -g -LDFLAGS ?= -#PREFIX ?= /usr -PREFIX ?= /opt/apps/org.tizen.bluetooth-share-ui -DATADIR ?= /opt/apps/org.tizen.bluetooth-share-ui -RESDIR ?= /opt/apps/org.tizen.bluetooth-share-ui/res - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 - CXXFLAGS += -O0 -else - CFLAGS += -O2 - CXXFLAGS += -O2 -endif - -LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed - -#CMAKE_TMP_DIR = $(CURDIR)/cmake_tmp - - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. -# mkdir -p $(CMAKE_TMP_DIR); - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake . -DCMAKE_INSTALL_PREFIX=$(PREFIX) - - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/wavplayer.sgml > wavplayer.1 - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - cat $$f > $${f%.in}; \ - sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \ - sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \ - sed -i -e "s#@RESDIR@#$(RESDIR)#g" $${f%.in}; \ - done - - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - #rm -rf $(CMAKE_TMP_DIR) - - for f in `find $(CURDIR)/ -name "CMakeCache.txt"`; do \ - rm -f $${f}; \ - done - - for f in `find $(CURDIR)/ -name "CMakeFiles"`; do \ - rm -rf $${f}; \ - done - - for f in `find $(CURDIR)/ -name "cmake_install.cmake"`; do \ - rm -f $${f}; \ - done - - for f in `find $(CURDIR)/ -name "Makefile"`; do \ - rm -f $${f}; \ - done - - for f in `find $(CURDIR)/ -name "install_manifest.txt"`; do \ - rm -f $${f}; \ - done - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - rm -f $${f%.in}; \ - done - rm -f data/*.desktop - rm -f *.edj - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/wavplayer. - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installchangelogs -# dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip --dbg-package=org.tizen.bluetooth-share-ui-dbg - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec index 4ffd2c0..76d6821 100755 --- a/packaging/org.tizen.bluetooth-share-ui.spec +++ b/packaging/org.tizen.bluetooth-share-ui.spec @@ -9,7 +9,6 @@ Group: TO_BE_FILLED License: Flora-1.1 Source0: %{name}-%{version}.tar.gz -BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(appcore-efl) diff --git a/src/bt-share-ui-ipc.c b/src/bt-share-ui-ipc.c index c59c0ed..eab1d7b 100644 --- a/src/bt-share-ui-ipc.c +++ b/src/bt-share-ui-ipc.c @@ -22,7 +22,6 @@ */ #include -#include #include #include #include diff --git a/src/bt-share-ui-main.c b/src/bt-share-ui-main.c index ff56686..dbd0758 100644 --- a/src/bt-share-ui-main.c +++ b/src/bt-share-ui-main.c @@ -115,7 +115,6 @@ static int __bt_share_launch_handler(bt_share_appdata_t *ad, bundle *b, FN_START; const char *transfer_type = NULL; const char *temp = NULL; - char *ptr = NULL; char *stop = NULL; unsigned char tranferred; int tr_type = 0; diff --git a/src/bt-share-ui-main.h b/src/bt-share-ui-main.h index 4201964..732835e 100644 --- a/src/bt-share-ui-main.h +++ b/src/bt-share-ui-main.h @@ -32,7 +32,6 @@ extern "C" { #include #include #include -#include #include #include #include -- 2.7.4 From 64322ce82ac7c11a021d343d7f44af15fdcf8b99 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Thu, 30 Nov 2017 16:38:30 +0900 Subject: [PATCH 09/16] remove build warning and clean up spec file Change-Id: I11d6f22126e80a349d593e2fd07855e4a5c64eb9 --- packaging/org.tizen.bluetooth-share-ui.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec index 76d6821..cc13da3 100755 --- a/packaging/org.tizen.bluetooth-share-ui.spec +++ b/packaging/org.tizen.bluetooth-share-ui.spec @@ -30,7 +30,7 @@ BuildRequires: edje-tools BuildRequires: gettext-devel BuildRequires: hash-signer -%define PKG_NAME org.tizen.bluetooth-share-ui +%define PKG_NAME %{name} %description bluetooth share UI application @@ -40,11 +40,6 @@ bluetooth share UI application %setup -q %build -export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" -export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" -export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" - -export CFLAGS="$CFLAGS -DTIZEN_EFL_THEME_2.2" export CFLAGS+=" -fpie -fvisibility=hidden" export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie" @@ -55,7 +50,7 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} %make_install -PKG_ID=org.tizen.bluetooth-share-ui +PKG_ID=%{name} %define tizen_sign 1 %define tizen_sign_base /usr/apps/${PKG_ID} %define tizen_sign_level platform @@ -74,11 +69,11 @@ PKG_ID=org.tizen.bluetooth-share-ui %manifest bluetooth-share-ui.manifest %license LICENSE %defattr(-,root,root,-) -%{_appdir}/org.tizen.bluetooth-share-ui/res/edje/bt-share-layout.edj -%{_appdir}/org.tizen.bluetooth-share-ui/res/edje/images.edj -%{_appdir}/org.tizen.bluetooth-share-ui/bin/bluetooth-share-ui -%{_appdir}/org.tizen.bluetooth-share-ui/author-signature.xml -%{_appdir}/org.tizen.bluetooth-share-ui/signature1.xml -%{_usrdir}/share/icons/default/small/org.tizen.bluetooth-share-ui.png -%{_usrdir}/share/packages/org.tizen.bluetooth-share-ui.xml +%{_appdir}/%{name}/res/edje/bt-share-layout.edj +%{_appdir}/%{name}/res/edje/images.edj +%{_appdir}/%{name}/bin/bluetooth-share-ui +%{_appdir}/%{name}/author-signature.xml +%{_appdir}/%{name}/signature1.xml +%{_usrdir}/share/icons/default/small/%{name}.png +%{_usrdir}/share/packages/%{name}.xml -- 2.7.4 From 8a21e60fb7869964d2a0be44a9c290e1b0315efb Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 16 Jan 2018 10:08:18 +0900 Subject: [PATCH 10/16] Fix the crash on bluetooth-share gtest Change-Id: I6e93f2f924e43d6846859b548ccd63dffd05a04f Signed-off-by: DoHyun Pyun --- src/bt-share-ui-main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bt-share-ui-main.c b/src/bt-share-ui-main.c index dbd0758..ba4b88b 100644 --- a/src/bt-share-ui-main.c +++ b/src/bt-share-ui-main.c @@ -317,6 +317,7 @@ static void __app_service(app_control_h app_control, void *user_data) if (launch_mode == BT_LAUNCH_NONE) { if (b) bundle_free(b); + _bt_terminate_app(); return; } -- 2.7.4 From 77a4f82719d2836d93d6aa50cbaa48cfe7c6a183 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 18 Dec 2018 09:13:42 +0900 Subject: [PATCH 11/16] Fix dlog format error Change-Id: I293f6bf2b81913bfd718cfdc69ed9cc90a65adee Signed-off-by: DoHyun Pyun --- src/bt-share-ui-ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bt-share-ui-ipc.c b/src/bt-share-ui-ipc.c index eab1d7b..656dad0 100644 --- a/src/bt-share-ui-ipc.c +++ b/src/bt-share-ui-ipc.c @@ -1193,7 +1193,7 @@ void _bt_share_ui_event_handler(int event, bt_share_event_param_t *param, else name = client_info->filename; - INFO("name address = [%x]", name); + INFO("name address = [%p]", name); __bt_share_ui_handle_progress(ad, 0, name, 100, TRUE, param->result); -- 2.7.4 From 6c2b15f6ddc48b002fbc069a083abf4bad0ba2e5 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Mon, 8 Jul 2019 15:32:10 +0900 Subject: [PATCH 12/16] Fix the coverity issue Change-Id: I965043b9853ed3645ae2d30e21ff5c4d6c47740c Signed-off-by: DoHyun Pyun --- src/bt-share-ui-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bt-share-ui-view.c b/src/bt-share-ui-view.c index d736768..cfc52ee 100644 --- a/src/bt-share-ui-view.c +++ b/src/bt-share-ui-view.c @@ -1083,7 +1083,7 @@ static void __bt_tr_data_item_sel(void *data, Evas_Object *obj, void *event_info INFO_SECURE("path : %s", path); - if (access(path, F_OK) == 0) + if (path && access(path, F_OK) == 0) __bt_open_file(path); else _bt_create_info_popup(ad, BT_STR_FILE_NOT_EXIST); @@ -1094,7 +1094,7 @@ static void __bt_tr_data_item_sel(void *data, Evas_Object *obj, void *event_info path = info->file_path; INFO_SECURE("path : %s", path); - if (access(path, F_OK) == 0) { + if (path && access(path, F_OK) == 0) { if (g_str_has_prefix(path, BT_CONTACT_SHARE_TMP_DIR) == TRUE) /* TODO: change to proper string when UX is updated */ _bt_create_info_popup(ad, BT_STR_FILE_NOT_EXIST); -- 2.7.4 From dc88e493723ea4398378cf8d70335cc3861190da Mon Sep 17 00:00:00 2001 From: Sudipto Date: Thu, 26 Dec 2019 15:15:13 +0530 Subject: [PATCH 13/16] Fix build warnings in branch Tizen Change-Id: Icbd2d5a93a3099f2dfeb2478ee69e2bdcc62a389 Signed-off-by: Sudipto --- src/bt-share-ui-view.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bt-share-ui-view.c b/src/bt-share-ui-view.c index cfc52ee..73a83e7 100644 --- a/src/bt-share-ui-view.c +++ b/src/bt-share-ui-view.c @@ -967,9 +967,8 @@ static bt_file_type_e __get_file_type(const char *name) if (extn != NULL) extn++; - DBG("extn : %s", extn); - if (extn != NULL) { + DBG("extn : %s", extn); if (!strcasecmp(extn, "png") || !strcasecmp(extn, "bmp") || !strcasecmp(extn, "gif") || !strcasecmp(extn, "jpg") || !strcasecmp(extn, "jpeg") || !strcasecmp(extn, "jpe") || !strcasecmp(extn, "jp2") || !strcasecmp(extn, "pjpeg") || !strcasecmp(extn, "tif") || @@ -1081,7 +1080,10 @@ static void __bt_tr_data_item_sel(void *data, Evas_Object *obj, void *event_info else if (default_memory == BT_DEFAULT_MEM_MMC) path = g_strdup_printf("%s/%s", BT_DOWNLOAD_MMC_FOLDER, info->file_path); - INFO_SECURE("path : %s", path); + if (path) + INFO_SECURE("path : %s", path); + else + INFO_SECURE("path is empty"); if (path && access(path, F_OK) == 0) __bt_open_file(path); -- 2.7.4 From 1b088baad73c1d76806fa774da6486b6e8099989 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Wed, 6 May 2020 07:26:57 +0900 Subject: [PATCH 14/16] Remove the unused code : homeraise dbus signal Change-Id: I257200e4d197f5dd757c4d5df2f3a34688d7e6ef Signed-off-by: DoHyun Pyun --- src/bt-share-ui-ipc.c | 40 +--------------------------------------- src/bt-share-ui-main.h | 2 -- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/bt-share-ui-ipc.c b/src/bt-share-ui-ipc.c index 656dad0..a751d87 100644 --- a/src/bt-share-ui-ipc.c +++ b/src/bt-share-ui-ipc.c @@ -36,9 +36,6 @@ #include "bt-share-ui-widget.h" #define BT_ADDRESS_LENGTH_MAX 6 -#define DBUS_CORE_APPS_PATH "/Org/Tizen/Coreapps/home/raise" -#define DBUS_CORE_APPS_INTERFACE "org.tizen.coreapps.home.raise" -#define DBUS_CORE_APPS_MEMBER "homeraise" static gboolean opc_launched_session; @@ -465,29 +462,6 @@ static void __handle_opp_disconnect_signal(void *data, DBusMessage * msg) DBG("-"); } -static void __handle_home_key_signal(void *data, DBusMessage *msg) -{ - const char *member; - - retm_if(data == NULL, "Invalid argument: data is NULL"); - retm_if(msg == NULL, "Invalid argument: msg is NULL"); - - member = dbus_message_get_member(msg); - retm_if(member == NULL, "member value is NULL"); - - if (dbus_message_get_type(msg) != DBUS_MESSAGE_TYPE_SIGNAL) - return; - - if (!dbus_message_has_interface(msg, DBUS_CORE_APPS_INTERFACE) || - !dbus_message_has_path(msg, DBUS_CORE_APPS_PATH)) - return; - - DBG("Received signal : %s", member); - - if (strcasecmp(member, DBUS_CORE_APPS_MEMBER) == 0) - _bt_terminate_app(); -} - static void __bt_add_tr_data_list(bt_share_appdata_t *ad, int transfer_type) { GSList *list = NULL; @@ -714,15 +688,6 @@ void _bt_signal_init(bt_share_appdata_t *ad) retm_if(sh == NULL, "Disconnected Event register failed\n"); ad->server_disconnected_sh = sh; - sh = e_dbus_signal_handler_add(conn, - NULL, - DBUS_CORE_APPS_PATH, - DBUS_CORE_APPS_INTERFACE, - DBUS_CORE_APPS_MEMBER, - __handle_home_key_signal, ad); - retm_if(sh == NULL, "Connect Event register failed"); - ad->app_core_sh = sh; - ad->dbus_conn = conn; return; @@ -772,10 +737,7 @@ void _bt_signal_deinit(bt_share_appdata_t *ad) e_dbus_signal_handler_del(ad->dbus_conn, ad->update_sh); ad->update_sh = NULL; } - if (ad->app_core_sh) { - e_dbus_signal_handler_del(ad->dbus_conn, ad->app_core_sh); - ad->app_core_sh = NULL; - } + return; } diff --git a/src/bt-share-ui-main.h b/src/bt-share-ui-main.h index 732835e..651edd0 100644 --- a/src/bt-share-ui-main.h +++ b/src/bt-share-ui-main.h @@ -146,8 +146,6 @@ typedef struct { E_DBus_Signal_Handler *update_sh; E_DBus_Signal_Handler *client_disconnected_sh; E_DBus_Signal_Handler *server_disconnected_sh; - /* Events from Appcore*/ - E_DBus_Signal_Handler *app_core_sh; bt_share_tr_type_e tr_type; char *db_sid; -- 2.7.4 From f3d21e3868ed5bf63a102a9cc7adea4d9e81db97 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Mon, 3 Aug 2020 10:27:59 +0900 Subject: [PATCH 15/16] Modify the package version In order to distinguish the package history as tizen version, we manage the package version from now. Change-Id: I5ac0c9f869369ae7390684184fb364e88b809464 Signed-off-by: DoHyun Pyun --- packaging/org.tizen.bluetooth-share-ui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec index cc13da3..36ec435 100755 --- a/packaging/org.tizen.bluetooth-share-ui.spec +++ b/packaging/org.tizen.bluetooth-share-ui.spec @@ -3,7 +3,7 @@ Name: org.tizen.bluetooth-share-ui Summary: bluetooth share UI application -Version: 0.2.1 +Version: 0.6.0 Release: 1 Group: TO_BE_FILLED License: Flora-1.1 -- 2.7.4 From 945cf410334e1fe05f7bac8b08f3793d55515e66 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Thu, 1 Jul 2021 10:38:26 +0900 Subject: [PATCH 16/16] Modify the genlist item style for IOT profile Change-Id: Ie3f8c122ffde971a4d24112377948f1dd5a278e4 Signed-off-by: DoHyun Pyun --- CMakeLists.txt | 1 + packaging/org.tizen.bluetooth-share-ui.spec | 3 +- src/bt-share-ui-main.c | 43 +++++++++++++++++++++++++++++ src/bt-share-ui-main.h | 13 +++++++++ src/bt-share-ui-resource.h | 3 ++ src/bt-share-ui-view.c | 26 +++++++++++++---- 6 files changed, 83 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab8e391..71b1826 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ pkg_check_modules(pkgs REQUIRED evas gobject-2.0 aul + capi-system-info capi-appfw-application capi-network-bluetooth bluetooth-share-api diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec index 36ec435..d5f453e 100755 --- a/packaging/org.tizen.bluetooth-share-ui.spec +++ b/packaging/org.tizen.bluetooth-share-ui.spec @@ -4,7 +4,7 @@ Name: org.tizen.bluetooth-share-ui Summary: bluetooth share UI application Version: 0.6.0 -Release: 1 +Release: 2 Group: TO_BE_FILLED License: Flora-1.1 Source0: %{name}-%{version}.tar.gz @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-network-bluetooth) +BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(bluetooth-share-api) BuildRequires: pkgconfig(notification) diff --git a/src/bt-share-ui-main.c b/src/bt-share-ui-main.c index ba4b88b..bd78c27 100644 --- a/src/bt-share-ui-main.c +++ b/src/bt-share-ui-main.c @@ -49,10 +49,53 @@ #include #include #include +#include bt_share_appdata_t *app_state = NULL; bt_share_appdata_t app_data = {0,}; +tizen_profile_t _get_tizen_profile() +{ + static tizen_profile_t profile = _PROFILE_UNKNOWN; + char *profileName = NULL; + + if (__builtin_expect(profile != _PROFILE_UNKNOWN, 1)) + return profile; + + system_info_get_platform_string("http://tizen.org/feature/profile", &profileName); + if (!profileName) + return _PROFILE_UNKNOWN; + + switch (*profileName) { + case 'm': + case 'M': + profile = _PROFILE_MOBILE; + break; + case 'w': + case 'W': + profile = _PROFILE_WEARABLE; + break; + case 't': + case 'T': + profile = _PROFILE_TV; + break; + case 'i': + case 'I': + if (!strncasecmp(profileName, "ivi", 3)) + profile = _PROFILE_IVI; + else if (!strncasecmp(profileName, "iot", 3)) + profile = _PROFILE_IOT; + else + profile = _PROFILE_COMMON; + break; + default: // common or unknown ==> ALL ARE COMMON. + profile = _PROFILE_COMMON; + } + free(profileName); + + return profile; +} + static void __bt_lang_changed_cb(app_event_info_h event_info, void *data) { DBG("+"); diff --git a/src/bt-share-ui-main.h b/src/bt-share-ui-main.h index 651edd0..3aeb4f1 100644 --- a/src/bt-share-ui-main.h +++ b/src/bt-share-ui-main.h @@ -89,6 +89,19 @@ typedef enum { BT_LAUNCH_TRANSFER_LIST } bt_share_launch_mode_t; +typedef enum { + _PROFILE_UNKNOWN = 0, + _PROFILE_MOBILE = 0x1, + _PROFILE_WEARABLE = 0x2, + _PROFILE_TV = 0x4, + _PROFILE_IVI = 0x8, + _PROFILE_IOT = 0x10, + _PROFILE_COMMON = 0x20, +} tizen_profile_t; + +tizen_profile_t _get_tizen_profile(); +#define TIZEN_COMMON ((_get_tizen_profile()) == _PROFILE_COMMON) + typedef struct { bt_share_launch_mode_t launch_mode; bt_adapter_state_e bt_status; diff --git a/src/bt-share-ui-resource.h b/src/bt-share-ui-resource.h index 0b8c67c..c279beb 100644 --- a/src/bt-share-ui-resource.h +++ b/src/bt-share-ui-resource.h @@ -104,6 +104,9 @@ extern "C" { #define BT_SHARE_ITEM_PART_DEVICE_NAME_TITLE "elm.text" #define BT_SHARE_ITEM_PART_DEVICE_NAME "elm.text.sub" +#define BT_SHARE_ITEM_PART_DEVICE_NAME_TITLE_COMMON "elm.icon" +#define BT_SHARE_ITEM_PART_DEVICE_NAME_COMMON "elm.end" + #define BT_SHARE_ITEM_PART_TRANSFER_TYPE_TITLE "elm.text" #define BT_SHARE_ITEM_PART_TRANSFER_STATUS "elm.text.sub" diff --git a/src/bt-share-ui-view.c b/src/bt-share-ui-view.c index 73a83e7..7f7a35d 100644 --- a/src/bt-share-ui-view.c +++ b/src/bt-share-ui-view.c @@ -385,14 +385,24 @@ static Evas_Object *__bt_tr_icon_get(void *data, Evas_Object *obj, ERR("Error in setting layout file"); #endif icon = elm_progressbar_add(obj); - elm_object_style_set(icon, "process_medium"); + + if (TIZEN_COMMON) + elm_object_style_set(icon, "process_small"); + else + elm_object_style_set(icon, "process_medium"); + evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_pulse(icon, TRUE); return icon; } else if (info->tr_status == BT_TRANSFER_PENDING) { icon = elm_progressbar_add(obj); - elm_object_style_set(icon, "process_medium"); + + if (TIZEN_COMMON) + elm_object_style_set(icon, "process_small"); + else + elm_object_style_set(icon, "process_medium"); + evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_pulse(icon, TRUE); @@ -643,9 +653,11 @@ static char *__bt_tr_device_label_get(void *data, Evas_Object *obj, retv_if(ad->transfer_info == NULL, NULL); - if (!strcmp(part, BT_SHARE_ITEM_PART_DEVICE_NAME_TITLE)) { + if (!strcmp(part, BT_SHARE_ITEM_PART_DEVICE_NAME_TITLE) || + !strcmp(part, BT_SHARE_ITEM_PART_DEVICE_NAME_TITLE_COMMON)) { return g_strdup(BT_STR_DEVICENAME); - } else if (!strcmp(part, BT_SHARE_ITEM_PART_DEVICE_NAME)) { + } else if (!strcmp(part, BT_SHARE_ITEM_PART_DEVICE_NAME) || + !strcmp(part, BT_SHARE_ITEM_PART_DEVICE_NAME_COMMON)) { bt_share_transfer_data_t *transfer_info = ad->transfer_info; DBG_SECURE("Device : %s", transfer_info->device_name); if (ad->bt_status == BT_ADAPTER_ENABLED) { @@ -1294,7 +1306,11 @@ static Evas_Object *__bt_add_tr_data_genlist(Evas_Object *parent, elm_genlist_homogeneous_set(genlist, EINA_TRUE); ad->tr_device_itc = elm_genlist_item_class_new(); if (ad->tr_device_itc) { - ad->tr_device_itc->item_style = "type1"; + if (TIZEN_COMMON) + ad->tr_device_itc->item_style = "2line"; + else + ad->tr_device_itc->item_style = "type1"; + ad->tr_device_itc->func.text_get = __bt_tr_device_label_get; ad->tr_device_itc->func.content_get = NULL; ad->tr_device_itc->func.state_get = NULL; -- 2.7.4