[permission_handler] Update based on review

* Change a long lambda to local function to improve readability * Apply naming convention * Use enum class instead of enum * Use constexpr rather than macro Signed-off-by: Boram Bae <boram21.bae@samsung.com>
flutter-tizen · Jun 30, 2021 · a9ca97f · a9ca97f
1 parent ac57ffa
commit a9ca97f
Show file tree

Hide file tree

Showing 6 changed files with 279 additions and 273 deletions.
diff --git a/packages/permission_handler/tizen/src/permission_handler_tizen_plugin.cc b/packages/permission_handler/tizen/src/permission_handler_tizen_plugin.cc
@@ -9,15 +9,17 @@
 #include "permission_manager.h"
 #include "service_manager.h"
 
-#define PERMISSION_HANDLER_CHANNEL_NAME \
-  "flutter.baseflow.com/permissions/methods"
+namespace {
+constexpr char kPermissionHandlerChannelName[] =
+    "flutter.baseflow.com/permissions/methods";
+}
 
 class PermissionHandlerTizenPlugin : public flutter::Plugin {
  public:
   static void RegisterWithRegistrar(flutter::PluginRegistrar *registrar) {
     auto channel =
         std::make_unique<flutter::MethodChannel<flutter::EncodableValue>>(
-            registrar->messenger(), PERMISSION_HANDLER_CHANNEL_NAME,
+            registrar->messenger(), kPermissionHandlerChannelName,
             &flutter::StandardMethodCodec::GetInstance());
 
     auto plugin = std::make_unique<PermissionHandlerTizenPlugin>();
@@ -46,16 +48,17 @@ class PermissionHandlerTizenPlugin : public flutter::Plugin {
       if (std::holds_alternative<int32_t>(*arguments)) {
         int permission = std::get<int32_t>(*arguments);
         auto reply = result.release();
-        auto on_success = [reply](int status) {
-          reply->Success(flutter::EncodableValue(status));
+        auto on_success = [reply](ServiceStatus status) {
+          reply->Success(flutter::EncodableValue(static_cast<int>(status)));
           delete reply;
         };
         auto on_error = [reply](const std::string &code,
                                 const std::string &message) {
           reply->Error(code, message);
           delete reply;
         };
-        service_manager_.CheckServiceStatus(permission, on_success, on_error);
+        service_manager_.CheckServiceStatus(
+            static_cast<PermissionGroup>(permission), on_success, on_error);
       } else {
         result->Error("MethodCall - Invalid arguments",
                       "arguments type of method checkServiceStatus isn't int");
@@ -65,17 +68,17 @@ class PermissionHandlerTizenPlugin : public flutter::Plugin {
       if (std::holds_alternative<int32_t>(*arguments)) {
         int permission = std::get<int32_t>(*arguments);
         auto reply = result.release();
-        auto on_success = [reply](int status) {
-          reply->Success(flutter::EncodableValue(status));
+        auto on_success = [reply](PermissionStatus status) {
+          reply->Success(flutter::EncodableValue(static_cast<int>(status)));
           delete reply;
         };
         auto on_error = [reply](const std::string &code,
                                 const std::string &message) {
           reply->Error(code, message);
           delete reply;
         };
-        permission_manager_.CheckPermissionStatus(permission, on_success,
-                                                  on_error);
+        permission_manager_.CheckPermissionStatus(
+            static_cast<PermissionGroup>(permission), on_success, on_error);
       } else {
         result->Error(
             "MethodCall - Invalid arguments",
@@ -84,20 +87,24 @@ class PermissionHandlerTizenPlugin : public flutter::Plugin {
     } else if (method_name.compare("requestPermissions") == 0) {
       const flutter::EncodableValue *arguments = method_call.arguments();
       if (std::holds_alternative<flutter::EncodableList>(*arguments)) {
-        std::vector<int> permissions;
+        std::vector<PermissionGroup> permissions;
         for (auto iter : std::get<flutter::EncodableList>(*arguments)) {
-          permissions.push_back(std::get<int32_t>(iter));
+          permissions.push_back(
+              static_cast<PermissionGroup>(std::get<int32_t>(iter)));
         }
         auto reply = result.release();
-        auto on_success = [reply](const std::map<int, int> &results) {
-          flutter::EncodableMap encodables;
-          for (auto [key, value] : results) {
-            encodables.emplace(flutter::EncodableValue(key),
-                               flutter::EncodableValue(value));
-          }
-          reply->Success(flutter::EncodableValue(encodables));
-          delete reply;
-        };
+        auto on_success =
+            [reply](
+                const std::map<PermissionGroup, PermissionStatus> &results) {
+              flutter::EncodableMap encodables;
+              for (auto [key, value] : results) {
+                encodables.emplace(
+                    flutter::EncodableValue(static_cast<int>(key)),
+                    flutter::EncodableValue(static_cast<int>(value)));
+              }
+              reply->Success(flutter::EncodableValue(encodables));
+              delete reply;
+            };
         auto on_error = [reply](const std::string &code,
                                 const std::string &message) {
           reply->Error(code, message);