Remove TODOs

These TODOs won't be fixed or are already fixed.

Change-Id: I78138e9120b1720986dddb44ab16d55e96432b0e

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index 77f63a2..5b9fc7a 100644 (file)
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -354,8 +354,6 @@ bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) {
       application->icon = g_list_append(application->icon, icon);
     }
 
-    // TODO(t.iwanek): what about description, how is it different from name?
-
     for (auto& category : service_info.categories()) {
       application->category = g_list_append(application->category,
                                             strdup(category.c_str()));
@@ -560,6 +558,7 @@ bool StepParse::FillExtraManifestInfo(manifest_x* manifest) {
 }
 
 bool StepParse::FillManifestX(manifest_x* manifest) {
+  // Fill data for main application
   if (!FillIconPaths(manifest))
     return false;
   if (!FillMainApplicationInfo(manifest))
@@ -576,18 +575,26 @@ bool StepParse::FillManifestX(manifest_x* manifest) {
     return false;
   if (!FillMetadata(manifest))
     return false;
-  // TODO(t.iwanek): fix adding ui application element
-  // for now adding application service is added here because rest of code
-  // assumes that there is one application at manifest->application
-  // so this must execute last. Don't move it above any item
-  if (!FillServiceApplicationInfo(manifest))
-    return false;
-  if (!FillWidgetApplicationInfo(manifest))
-    return false;
   if (!FillBackgroundCategoryInfo(manifest))
     return false;
+
+  // Fill data for other applications
+  if (!FillAdditionalApplications(manifest))
+    return false;
+
+  // Fill extra data, other than manifest_x structure
   if (!FillExtraManifestInfo(manifest))
     return false;
+
+  return true;
+}
+
+
+bool StepParse::FillAdditionalApplications(manifest_x* manifest) {
+  if (!FillServiceApplicationInfo(manifest))
+    return false;
+  if (!FillWidgetApplicationInfo(manifest))
+    return false;
   return true;
 }
 

diff --git a/src/wgt/step/configuration/step_parse.h b/src/wgt/step/configuration/step_parse.h
index 69015fc..0effc8f 100644 (file)
--- a/src/wgt/step/configuration/step_parse.h
+++ b/src/wgt/step/configuration/step_parse.h
@@ -70,6 +70,7 @@ class StepParse : public common_installer::Step {
   bool FillImeInfo();
   bool FillAppWidget();
   bool FillBackgroundCategoryInfo(manifest_x* manifest);
+  bool FillAdditionalApplications(manifest_x* manifest);
   bool FillManifestX(manifest_x* manifest);
 
   std::unique_ptr<wgt::parse::WidgetConfigParser> parser_;

diff --git a/src/wgt/step/encryption/step_encrypt_resources.cc b/src/wgt/step/encryption/step_encrypt_resources.cc
index f8d5640..ad5485f 100644 (file)
--- a/src/wgt/step/encryption/step_encrypt_resources.cc
+++ b/src/wgt/step/encryption/step_encrypt_resources.cc
@@ -92,7 +92,7 @@ bool StepEncryptResources::Encrypt(const bf::path &src) {
     if (error_code)
       return false;
     if (is_sym)
-      continue;  // TODO(p.sikorski) is it enough?
+      continue;
 
     // it is regular file (not dir, not symlink)
     if (ToBeEncrypted(current)) {
@@ -134,7 +134,6 @@ bool StepEncryptResources::EncryptFile(const bf::path &src) {
 
   unsigned char* encrypted_data = nullptr;
   size_t enc_data_len = 0;
-  // TODO(p.sikorski) check if it is Preloaded
   int ret;
   if (context_->request_mode.get() == common_installer::RequestMode::GLOBAL)
     ret = wae_encrypt_global_web_application(

diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
index 879c7fd..16b27a0 100644 (file)
--- a/src/wgt/step/pkgmgr/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.cc
@@ -324,7 +324,6 @@ common_installer::Step::Status StepGenerateXml::precheck() {
     LOG(ERROR) << "No application in package";
     return Step::Status::INVALID_VALUE;
   }
-  // TODO(p.sikorski) check context_->uid.get()
 
   return Step::Status::OK;
 }