Fix for not closed app-control element during xml generation

Commit https://review.tizen.org/gerrit/#/c/36834/ introduced
bug related to not closing app-control element and as a result
privilege element is inserted into ui-application element and
manifest don't pass validation.

Change-Id: If6e50fe196ffe783d307d80fb48821eb87a2da94

diff --git a/src/common/step/step_generate_xml.cc b/src/common/step/step_generate_xml.cc
index ed1a044..e393538 100644 (file)
--- a/src/common/step/step_generate_xml.cc
+++ b/src/common/step/step_generate_xml.cc
@@ -73,19 +73,26 @@ Step::Status StepGenerateXml::GenerateApplicationCommonXml(T* app,
       appc = appc->next) {
     xmlTextWriterStartElement(writer, BAD_CAST "app-control");
 
-    xmlTextWriterStartElement(writer, BAD_CAST "operation");
-    xmlTextWriterWriteAttribute(writer, BAD_CAST "name",
-        BAD_CAST appc->operation->name);
-    xmlTextWriterEndElement(writer);
+    if (appc->operation) {
+      xmlTextWriterStartElement(writer, BAD_CAST "operation");
+      xmlTextWriterWriteAttribute(writer, BAD_CAST "name",
+          BAD_CAST appc->operation->name);
+      xmlTextWriterEndElement(writer);
+    }
 
-    xmlTextWriterStartElement(writer, BAD_CAST "uri");
-    xmlTextWriterWriteAttribute(writer, BAD_CAST "name",
-        BAD_CAST appc->uri->name);
-    xmlTextWriterEndElement(writer);
+    if (appc->uri) {
+      xmlTextWriterStartElement(writer, BAD_CAST "uri");
+      xmlTextWriterWriteAttribute(writer, BAD_CAST "name",
+          BAD_CAST appc->uri->name);
+      xmlTextWriterEndElement(writer);
+    }
 
-    xmlTextWriterStartElement(writer, BAD_CAST "mime");
-    xmlTextWriterWriteAttribute(writer, BAD_CAST "name",
-        BAD_CAST appc->mime->name);
+    if (appc->mime) {
+      xmlTextWriterStartElement(writer, BAD_CAST "mime");
+      xmlTextWriterWriteAttribute(writer, BAD_CAST "name",
+          BAD_CAST appc->mime->name);
+      xmlTextWriterEndElement(writer);
+    }
 
     xmlTextWriterEndElement(writer);
   }