Added possibility to create AppControl object with App ID.

Added App Control request for selecting ringtone.

Change-Id: I2899da5b82e2106059e3402c2adb7bf59d9a19e0
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-apps-common/inc/App/AppControl.h b/lib-apps-common/inc/App/AppControl.h
index 9f2f172..682da79 100644 (file)
--- a/lib-apps-common/inc/App/AppControl.h
+++ b/lib-apps-common/inc/App/AppControl.h
@@ -32,6 +32,13 @@ namespace App
                AppControl();
 
                /**
+                * @brief Create a direct app control request
+                *
+                * @see app_control_set_app_id()
+                */
+               explicit AppControl(const char *appId);
+
+               /**
                 * @brief Create app control request
                 *
                 * @see app_control_set_operation()
@@ -39,7 +46,7 @@ namespace App
                 * @see app_control_set_uri()
                 */
                AppControl(const char *operation,
-                               const char *mime = nullptr,
+                               const char *mime,
                                const char *uri = nullptr);
 
                AppControl(const AppControl&) = delete;

diff --git a/lib-apps-common/inc/App/AppControlRequest.h b/lib-apps-common/inc/App/AppControlRequest.h
index a7d1081..b7dae30 100644 (file)
--- a/lib-apps-common/inc/App/AppControlRequest.h
+++ b/lib-apps-common/inc/App/AppControlRequest.h
@@ -135,6 +135,13 @@ namespace App
        AppControl EXPORT_API requestPickVcard(const char *path);
 
        /**
+        * @brief Request pick ringtone from Settings
+        * @param[in]   selectedPath    Path of currently selected ringtone
+        * @return AppControl wrapper
+        */
+       AppControl EXPORT_API requestPickRingtone(const char *selectedPath);
+
+       /**
         * @brief Get single first string from App Control array extra data.
         * @param[in]   appControl  App Control handle
         * @param[in]   key         Extra data array key

diff --git a/lib-apps-common/src/App/AppControl.cpp b/lib-apps-common/src/App/AppControl.cpp
index a3b1ed0..4d6c3d3 100644 (file)
--- a/lib-apps-common/src/App/AppControl.cpp
+++ b/lib-apps-common/src/App/AppControl.cpp
@@ -25,6 +25,13 @@ AppControl::AppControl()
 {
 }
 
+AppControl::AppControl(const char *appId)
+       : AppControl()
+{
+       app_control_create(&m_AppControl);
+       app_control_set_app_id(m_AppControl, appId);
+}
+
 AppControl::AppControl(const char *operation, const char *mime, const char *uri)
        : AppControl()
 {

diff --git a/lib-apps-common/src/App/AppControlRequest.cpp b/lib-apps-common/src/App/AppControlRequest.cpp
index d2097c1..61bb8b2 100644 (file)
--- a/lib-apps-common/src/App/AppControlRequest.cpp
+++ b/lib-apps-common/src/App/AppControlRequest.cpp
@@ -61,7 +61,7 @@ AppControl App::requestTelephonyCall(const char *number)
 
 AppControl App::requestCallSettings()
 {
-       return AppControl(APP_CONTROL_OPERATION_SETTING_CALL);
+       return AppControl(APP_CONTROL_OPERATION_SETTING_CALL, nullptr);
 }
 
 AppControl App::requestMessageComposer(const char *scheme, const char *to,
@@ -109,13 +109,20 @@ AppControl App::requestMultiShareContacts(const char **personIds, int count)
 
 AppControl App::requestPickVcard(const char *path)
 {
-       //TODO: Replace it with AppControl which will not use application id.
-       AppControl request(nullptr);
+       /* FIXME: Replace with indirect request */
+       AppControl request("org.tizen.ug-myfile-efl");
        request.addExtra("path", path);
        request.addExtra("select_type", "IMPORT_PATH_SELECT");
        request.addExtra("file_type", "vcf");
-       app_control_set_app_id(request.getHandle(), "org.tizen.ug-myfile-efl");
+       return request;
+}
 
+AppControl App::requestPickRingtone(const char *selectedPath)
+{
+       /* FIXME: Replace with indirect request */
+       AppControl request("setting-ringtone-efl");
+       request.addExtra("marked_mode", selectedPath);
+       request.addExtra("path", "/opt/share/settings/Ringtones");
        return request;
 }
 

diff --git a/lib-phone/src/Phone/SpeedDial/SettingsItem.cpp b/lib-phone/src/Phone/SpeedDial/SettingsItem.cpp
index 295515c..bc4568a 100644 (file)
--- a/lib-phone/src/Phone/SpeedDial/SettingsItem.cpp
+++ b/lib-phone/src/Phone/SpeedDial/SettingsItem.cpp
@@ -39,7 +39,7 @@ using namespace Phone;
 using namespace Phone::SpeedDial;
 
 SettingsItem::SettingsItem(int number)
-       : m_Number(number), m_Chooser(nullptr)
+       : m_Number(number)
 {
 }