From: Woochanlee Date: Tue, 14 Sep 2021 08:10:38 +0000 (+0900) Subject: aurum: Code clean up for 1.0 Release X-Git-Tag: submit/tizen/20210928.232914~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F264197%2F5;p=platform%2Fcore%2Fuifw%2Faurum.git aurum: Code clean up for 1.0 Release 1. Delete useless class such as capi, AccessibleUtils. 2. Delete commented out codes. 3. Delete useless build configure. 4. Delete uesless methods. 5. Delete useless event types. 6. Code indentations. Change-Id: I5bd1495ebfd41990b52f5c9ecc4a630ed43a057f --- diff --git a/libaurum/capi/inc/capi_uidevice.h b/libaurum/capi/inc/capi_uidevice.h deleted file mode 100644 index b91be75..0000000 --- a/libaurum/capi/inc/capi_uidevice.h +++ /dev/null @@ -1,164 +0,0 @@ -#pragma once - - -typedef enum _KeyRequestType { - STROKE, - LONG_STROKE, - PRESS, - RELEASE, -} KeyRequestType; - -typedef enum _TimeRequestType { - WALLCLOCK, - MONOTONIC, -} TimeRequestType; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_click(const int x, const int y); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_interval_click(const int x, const int y, const unsigned int intv); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_drag(const int sx, const int sy, const int ex, const int ey, - const int steps, const int durationMs); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_touchDown(const int x, const int y); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_touchMove(const int x, const int y, const int seq); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_touchUp(const int x, const int y, const int seq); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_wheelUp(int amount, const int durationMs); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_wheelDown(int amount, const int durationMs); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressBack(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressHome(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressMenu(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressVolUp(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressVolDown(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressPower(KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_pressKeyCode(char* keycode, KeyRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_takeScreenshot(char* path, float scale, int quality); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -long long aurum_uidevice_getSystemTime(TimeRequestType type); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -int aurum_uidevice_hasObject(const std::shared_ptr selector); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::shared_ptr aurum_uidevice_findObject( - const std::shared_ptr selector) const; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::vector> aurum_uidevice_findObjects( - const std::shared_ptr selector) const; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -/* -bool aurum_uidevice_waitFor( - const std::function condition) const; -*/ -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::shared_ptr aurum_uidevice_waitFor( - const std::function(const ISearchable *)> - condition) const; -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::shared_ptr aurum_uidevice_getInstance(IDevice *deviceImpl = nullptr); - -/** - * @brief TBD - * @since_tizen 5.5 - */ -std::vector> aurum_uidevice_getWindowRoot() const; diff --git a/libaurum/capi/src/capi_uidevice.c b/libaurum/capi/src/capi_uidevice.c deleted file mode 100644 index da98682..0000000 --- a/libaurum/capi/src/capi_uidevice.c +++ /dev/null @@ -1 +0,0 @@ -#include "capi_uidevice.h" \ No newline at end of file diff --git a/libaurum/inc/Accessibility/Accessible.h b/libaurum/inc/Accessibility/Accessible.h index 1f369be..df22041 100644 --- a/libaurum/inc/Accessibility/Accessible.h +++ b/libaurum/inc/Accessibility/Accessible.h @@ -1,7 +1,6 @@ #pragma once #include "AccessibleNode.h" -#include "AccessibleUtils.h" #include "AccessibleWatcher.h" #include "AccessibleApplication.h" #include "AccessibleWindow.h" diff --git a/libaurum/inc/Accessibility/AccessibleNode.h b/libaurum/inc/Accessibility/AccessibleNode.h index bbef725..c5dc2b5 100644 --- a/libaurum/inc/Accessibility/AccessibleNode.h +++ b/libaurum/inc/Accessibility/AccessibleNode.h @@ -6,9 +6,7 @@ #include #include -#include "AccessibleUtils.h" #include "IEventConsumer.h" - #include "Rect.h" #include "config.h" @@ -63,7 +61,7 @@ enum class NodeFeatureProperties { * @since_tizen 5.5 */ class AccessibleNode : public std::enable_shared_from_this, public IEventConsumer { -public: // Constructor & Destructor +public: /** * @brief TBD * @since_tizen 5.5 diff --git a/libaurum/inc/Accessibility/AccessibleUtils.h b/libaurum/inc/Accessibility/AccessibleUtils.h deleted file mode 100644 index 3b38a84..0000000 --- a/libaurum/inc/Accessibility/AccessibleUtils.h +++ /dev/null @@ -1,113 +0,0 @@ -#pragma once - -//#include -#include - -#include -#include - -#include "config.h" - -/** - * @brief TBD - * @since_tizen 5.5 - */ -struct GobjDeletor { - void operator()(gpointer ptr) const - { - if (ptr) g_object_unref(ptr); - } -}; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -struct GarrayDeletor { - void operator()(GArray *ptr) const - { - if (ptr) g_array_free(ptr, 1); - } -}; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -using unique_ptr_gobj = std::unique_ptr; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -using unique_ptr_garray = std::unique_ptr; - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -unique_ptr_gobj make_gobj_unique(T *ptr) -{ - return unique_ptr_gobj(ptr); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -unique_ptr_garray make_garray_unique(T *ptr) -{ - return unique_ptr_garray(ptr); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -unique_ptr_gobj make_gobj_ref_unique(T *ptr) -{ - g_object_ref(ptr); - return unique_ptr_gobj(ptr); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -std::shared_ptr make_gobj_shared(T *ptr) -{ - return std::shared_ptr(ptr, [](T *ptr){ if(ptr) g_object_unref(ptr); }); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -std::shared_ptr make_garray_shared(T *ptr) -{ - return std::shared_ptr(ptr, [](T *ptr){ if(ptr) g_array_free(ptr, 1); }); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -template -std::shared_ptr make_gobj_ref_shared(T *ptr) -{ - g_object_ref(ptr); - return std::shared_ptr(ptr, [](T *ptr){ if(ptr) g_object_unref(ptr); }); -} - -/** - * @brief TBD - * @since_tizen 5.5 - */ -//char *state_to_char(AtspiStateType state); diff --git a/libaurum/inc/Accessibility/AccessibleWatcher.h b/libaurum/inc/Accessibility/AccessibleWatcher.h index 3090741..c01654b 100644 --- a/libaurum/inc/Accessibility/AccessibleWatcher.h +++ b/libaurum/inc/Accessibility/AccessibleWatcher.h @@ -3,7 +3,6 @@ #include "AccessibleApplication.h" #include "AccessibleWindow.h" #include "AccessibleNode.h" -#include "AccessibleUtils.h" #include "IEventSource.h" #include "Runnable.h" #include "A11yEvent.h" @@ -59,13 +58,18 @@ public: */ virtual std::vector> getApplications(void) const = 0; - /**s + /** * @brief TBD * @since_tizen 6.5 */ virtual bool executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) = 0; + /** + * @brief TBD + * @since_tizen 6.5 + */ virtual std::map> getActiveAppMap(void) = 0; + public: /** * @brief TBD diff --git a/libaurum/inc/Accessibility/IEventConsumer.h b/libaurum/inc/Accessibility/IEventConsumer.h index 970e516..5240ecc 100644 --- a/libaurum/inc/Accessibility/IEventConsumer.h +++ b/libaurum/inc/Accessibility/IEventConsumer.h @@ -1,20 +1,13 @@ #pragma once enum class EventType { - Window, - Object, -}; - -enum class WindowEventType { - WindowActivated, - WindowDeactivated, - WindowCreated, - WindowDestroyed, + none = 0, + Object = 1, }; enum class ObjectEventType { - ObjectStateVisible, - ObjectStateDefunct, + none = 0, + ObjectStateDefunct = 1, }; class IEventConsumer diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 663835f..a089e4c 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -37,36 +37,6 @@ public: */ virtual ~IAtspiEvents() {} - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowDeactivated(AtspiAccessible *node) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowCreated(AtspiAccessible *node) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onWindowDestroyed(AtspiAccessible *node) = 0; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - virtual void onVisibilityChanged(AtspiAccessible *node, bool visible) = 0; - /** * @brief TBD * @since_tizen 5.5 @@ -114,36 +84,6 @@ public: */ static void onAtspiEvents(AtspiEvent *event, void *user_data); - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowDeactivated(AtspiAccessible *node) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowCreated(AtspiAccessible *node) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onWindowDestroyed(AtspiAccessible *node) override; - - /** - * @brief TBD - * @since_tizen 5.5 - */ - void onVisibilityChanged(AtspiAccessible *node, bool visible) override; - /** * @brief TBD * @since_tizen 5.5 @@ -180,8 +120,6 @@ private: */ bool addToWindowSet(AtspiAccessible *node); - void print_debug(); - /** * @brief TBD * @since_tizen 6.5 diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index 01541db..fff19b5 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -1,13 +1,11 @@ #pragma once #include "config.h" - #include "IDevice.h" -#include -#ifdef GBS_BUILD +#include #include -#endif + /** * @brief TizenDeviceImpl Class * @since_tizen 5.5 diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index ae33f60..9218a3d 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -21,7 +21,7 @@ public: * @since_tizen 5.5 */ Waiter(const ISearchable *searchableObject, - const UiObject *uiObject = nullptr); // : mObject{object} + const UiObject *uiObject = nullptr); /** * @brief TBD diff --git a/libaurum/src/Accessibility/AccessibleUtils.cc b/libaurum/src/Accessibility/AccessibleUtils.cc deleted file mode 100644 index b126880..0000000 --- a/libaurum/src/Accessibility/AccessibleUtils.cc +++ /dev/null @@ -1,119 +0,0 @@ -#include "Aurum.h" - -#include - -char* state_to_char(AtspiStateType state) -{ - switch (state) { - case ATSPI_STATE_INVALID: - return strdup("ATSPI_STATE_INVALID"); - case ATSPI_STATE_ACTIVE: - return strdup("ATSPI_STATE_ACTIVE"); - case ATSPI_STATE_ARMED: - return strdup("ATSPI_STATE_ARMED"); - case ATSPI_STATE_BUSY: - return strdup("ATSPI_STATE_BUSY"); - case ATSPI_STATE_CHECKED: - return strdup("ATSPI_STATE_CHECKED"); - case ATSPI_STATE_COLLAPSED: - return strdup("ATSPI_STATE_COLLAPSED"); - case ATSPI_STATE_DEFUNCT: - return strdup("ATSPI_STATE_DEFUNCT"); - case ATSPI_STATE_EDITABLE: - return strdup("ATSPI_STATE_EDITABLE"); - case ATSPI_STATE_ENABLED: - return strdup("ATSPI_STATE_ENABLED"); - case ATSPI_STATE_EXPANDABLE: - return strdup("ATSPI_STATE_EXPANDABLE"); - case ATSPI_STATE_EXPANDED: - return strdup("ATSPI_STATE_EXPANDED"); - case ATSPI_STATE_FOCUSABLE: - return strdup("ATSPI_STATE_FOCUSABLE"); - case ATSPI_STATE_FOCUSED: - return strdup("ATSPI_STATE_FOCUSED"); - case ATSPI_STATE_HAS_TOOLTIP: - return strdup("ATSPI_STATE_HAS_TOOLTIP"); - case ATSPI_STATE_HORIZONTAL: - return strdup("ATSPI_STATE_HORIZONTAL"); - case ATSPI_STATE_ICONIFIED: - return strdup("ATSPI_STATE_ICONIFIED"); - case ATSPI_STATE_MULTI_LINE: - return strdup("ATSPI_STATE_MULTI_LINE"); - case ATSPI_STATE_MULTISELECTABLE: - return strdup("ATSPI_STATE_MULTISELECTABLE"); - case ATSPI_STATE_OPAQUE: - return strdup("ATSPI_STATE_OPAQUE"); - case ATSPI_STATE_PRESSED: - return strdup("ATSPI_STATE_PRESSED"); - case ATSPI_STATE_RESIZABLE: - return strdup("ATSPI_STATE_RESIZABLE"); - case ATSPI_STATE_SELECTABLE: - return strdup("ATSPI_STATE_SELECTABLE"); - case ATSPI_STATE_SELECTED: - return strdup("ATSPI_STATE_SELECTED"); - case ATSPI_STATE_SENSITIVE: - return strdup("ATSPI_STATE_SENSITIVE"); - case ATSPI_STATE_SHOWING: - return strdup("ATSPI_STATE_SHOWING"); - case ATSPI_STATE_SINGLE_LINE: - return strdup("ATSPI_STATE_SINGLE_LINE"); - case ATSPI_STATE_STALE: - return strdup("ATSPI_STATE_STALE"); - case ATSPI_STATE_TRANSIENT: - return strdup("ATSPI_STATE_TRANSIENT"); - case ATSPI_STATE_VERTICAL: - return strdup("ATSPI_STATE_VERTICAL"); - case ATSPI_STATE_VISIBLE: - return strdup("ATSPI_STATE_VISIBLE"); - case ATSPI_STATE_MANAGES_DESCENDANTS: - return strdup("ATSPI_STATE_MANAGES_DESCENDANTS"); - case ATSPI_STATE_INDETERMINATE: - return strdup("ATSPI_STATE_INDETERMINATE"); - case ATSPI_STATE_REQUIRED: - return strdup("ATSPI_STATE_REQUIRED"); - case ATSPI_STATE_TRUNCATED: - return strdup("ATSPI_STATE_TRUNCATED"); - case ATSPI_STATE_ANIMATED: - return strdup("ATSPI_STATE_ANIMATED"); - case ATSPI_STATE_INVALID_ENTRY: - return strdup("ATSPI_STATE_INVALID_ENTRY"); - case ATSPI_STATE_SUPPORTS_AUTOCOMPLETION: - return strdup("ATSPI_STATE_SUPPORTS_AUTOCOMPLETION"); - case ATSPI_STATE_SELECTABLE_TEXT: - return strdup("ATSPI_STATE_SELECTABLE_TEXT"); - case ATSPI_STATE_IS_DEFAULT: - return strdup("ATSPI_STATE_IS_DEFAULT"); - case ATSPI_STATE_VISITED: - return strdup("ATSPI_STATE_VISITED"); - case ATSPI_STATE_CHECKABLE: - return strdup("ATSPI_STATE_CHECKABLE"); - case ATSPI_STATE_HAS_POPUP: - return strdup("ATSPI_STATE_HAS_POPUP"); - case ATSPI_STATE_READ_ONLY: - return strdup("ATSPI_STATE_READ_ONLY"); - case ATSPI_STATE_LAST_DEFINED: - return strdup("ATSPI_STATE_LAST_DEFINED"); - case ATSPI_STATE_MODAL: - return strdup("ATSPI_STATE_MODAL"); - default: - return strdup("\0"); - } -} - -static void _print_stateset_debug( AtspiStateSet *stateSet) -{ - if (!stateSet) return; - GArray *states = AtspiWrapper::Atspi_state_set_get_states(stateSet); - if (!states) return; - - char *state_name = NULL; - AtspiStateType stat; - LOGI("check ss:%p s:%p, len:%d", stateSet, states, states->len); - for (int i = 0; states && (i < states->len); ++i) { - stat = g_array_index(states, AtspiStateType, i); - state_name = state_to_char(stat); - LOGI("state: %s", state_name); - free(state_name); - } - g_array_free(states, 1); -} \ No newline at end of file diff --git a/libaurum/src/Accessibility/meson.build b/libaurum/src/Accessibility/meson.build index 9eb7868..4bb5f1d 100644 --- a/libaurum/src/Accessibility/meson.build +++ b/libaurum/src/Accessibility/meson.build @@ -1,7 +1,6 @@ libaurum_src += [ files('AccessibleApplication.cc'), files('AccessibleNode.cc'), - #files('AccessibleUtils.cc'), files('AccessibleWatcher.cc'), files('AccessibleWindow.cc'), ] \ No newline at end of file diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index fa61623..4d8c6d6 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -11,6 +11,9 @@ #include #include +#define COMPARE(A, B) \ + (B != A11yEvent::EVENT_NONE) && ((A & B) == B) + std::vector> AtspiAccessibleWatcher::mEventQueue; GThread *AtspiAccessibleWatcher::mEventThread = nullptr; std::mutex AtspiAccessibleWatcher::mMutex = std::mutex{}; @@ -188,56 +191,6 @@ void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) if (pkg) free(pkg); } -void AtspiAccessibleWatcher::print_debug() -{ - LOGI("activatewindowlist-------------------"); - std::for_each(mActivatedWindowList.begin(), mActivatedWindowList.end(), [](auto acc){ - LOGI("child:%p", acc); - }); - - LOGI("mActivatedApplicationList--------------------------"); - std::for_each(mActivatedApplicationList.begin(), mActivatedApplicationList.end(), [](auto acc){ - LOGI("child:%p", acc); - }); - - LOGI("mWindowSet------------------------------"); - std::for_each(mWindowSet.begin(), mWindowSet.end(), [](auto acc){ - LOGI("child:%p", acc); - }); - LOGI("------------------------------"); -} - -void AtspiAccessibleWatcher::onWindowActivated(AtspiAccessible *node, - WindowActivateInfoType type) -{ - LOGI("onWindowActivated obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowActivated, node); -} - -void AtspiAccessibleWatcher::onWindowDeactivated(AtspiAccessible *node) -{ - LOGI("onWindowDeactivated obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowDeactivated, node); -} - -void AtspiAccessibleWatcher::onWindowCreated(AtspiAccessible *node) -{ - LOGI("onWindowCreated obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowCreated, node); -} - -void AtspiAccessibleWatcher::onWindowDestroyed(AtspiAccessible *node) -{ - LOGI("onWindowDestroyed obj:%p", node); - notifyAll((int)EventType::Window, (int)WindowEventType::WindowDestroyed, node); -} - -void AtspiAccessibleWatcher::onVisibilityChanged(AtspiAccessible *node, bool visible) -{ - LOGI("onVisibilityChanged obj:%p", node); - notifyAll((int)EventType::Object, (int)ObjectEventType::ObjectStateVisible, node); -} - void AtspiAccessibleWatcher::onObjectDefunct(AtspiAccessible *node) { LOGI("onObjectDefunct obj:%p", node); @@ -282,9 +235,6 @@ std::vector> AtspiAccessibleWatcher::getA return ret; } -#define COMPARE(A, B) \ - (B != A11yEvent::EVENT_NONE) && ((A & B) == B) - bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) { mMutex.lock(); diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index 6470a85..e8f7cdd 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -31,16 +31,6 @@ UiObject::UiObject(const std::shared_ptr device, const std::shared_ptr { } -// UiObject::UiObject(const UiObject &src) -// : mDevice(src.mDevice), -// mSelector(src.mSelector), -// mNode(src.mNode), -// mWaiter{src.mWaiter}, -// mNode_src(std::move(src.mNode_src)) - -// { -// } - UiObject::UiObject(UiObject &&src) : mDevice(src.mDevice), mSelector(std::move(src.mSelector)), diff --git a/meson.build b/meson.build index 68d7bd9..3a8f395 100644 --- a/meson.build +++ b/meson.build @@ -9,8 +9,6 @@ dir_include = join_paths(dir_prefix, get_option('includedir')) config_h = configuration_data() if get_option('tizen') == true - config_h.set10('GBS_BUILD', true) - config_h.set10('GBSBUILD', true) config_h.set10('TIZEN', true) else message('') diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc index c1073f4..d1863d2 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc @@ -2,9 +2,7 @@ #include "CloseAppCommand.h" #include #include -#ifdef GBSBUILD #include -#endif CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, ::aurum::RspCloseApp *response) @@ -15,7 +13,7 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, ::grpc::Status CloseAppCommand::execute() { LOGI("CloseApp --------------- "); -#ifdef GBSBUILD + std::string packageName = mRequest->packagename(); app_context_h app_context = NULL; @@ -33,7 +31,7 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, mResponse->set_status(::aurum::RspStatus::ERROR); return grpc::Status::OK; } -#endif + return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc index cf14e32..4e155bb 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc @@ -1,9 +1,7 @@ #include "bootstrap.h" #include "GetAppInfoCommand.h" -#ifdef GBSBUILD #include #include -#endif GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, ::aurum::RspGetAppInfo *response) @@ -14,7 +12,7 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, ::grpc::Status GetAppInfoCommand::execute() { LOGI("GetAppInfo --------------- "); -#ifdef GBSBUILD + std::string packageName = mRequest->packagename(); app_context_h app_context; @@ -45,6 +43,5 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, } } -#endif return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc index 500557a..9e1b0b2 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc @@ -3,9 +3,7 @@ #include #include #include -#ifdef GBSBUILD #include -#endif InstallAppCommand::InstallAppCommand( ::grpc::ServerReader<::aurum::ReqInstallApp> *request, @@ -17,7 +15,7 @@ InstallAppCommand::InstallAppCommand( ::grpc::Status InstallAppCommand::execute() { LOGI("InstallApp --------------- "); -#ifdef GBSBUILD + ::aurum::ReqInstallApp chunk; std::ofstream outfile("/tmp/app.tpk", std::ofstream::binary); @@ -34,7 +32,7 @@ InstallAppCommand::InstallAppCommand( package_manager_request_create(&pkgRequest); package_manager_request_install(pkgRequest, "/tmp/app.tpk", &id); -#endif + return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc index 7c20460..3fe4c37 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc @@ -2,9 +2,7 @@ #include "RemoveAppCommand.h" #include #include -#ifdef GBSBUILD #include -#endif RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, ::aurum::RspRemoveApp* response) @@ -16,7 +14,6 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, { LOGI("RemoveAppCommand::execute"); -#ifdef GBSBUILD package_manager_request_h pkgRequest; std::string name = mRequest->packagename(); int id; @@ -27,7 +24,7 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, mResponse->set_status(::aurum::RspStatus::OK); } } -#endif + return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc b/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc index 887a44a..b842b8d 100644 --- a/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc +++ b/org.tizen.aurum-bootstrap/src/Runnable/LaunchAppRunnable.cc @@ -2,10 +2,7 @@ #include "bootstrap.h" #include "LaunchAppCommand.h" #include "LaunchAppRunnable.h" - -#ifdef GBSBUILD #include -#endif LaunchAppRunnable::LaunchAppRunnable(std::string pkg, const google::protobuf::RepeatedPtrField& data) : mPkg{pkg}, mData(data) @@ -14,7 +11,6 @@ LaunchAppRunnable::LaunchAppRunnable(std::string pkg, const google::protobuf::Re void LaunchAppRunnable::run() const { -#ifdef GBSBUILD app_control_h appControl; std::string packageName = mPkg; int ret = -1; @@ -51,7 +47,6 @@ void LaunchAppRunnable::run() const } app_control_destroy(appControl); -#endif } std::string LaunchAppRunnable::getPkgName()