fix(inventory): fix inventory XML / JSON data

Signed-off-by: Teclib <skita@teclib.com>

Author: stonebuzz

inventory/src/main/java/org/flyve/inventory/Utils.java

@@ -159,18 +159,12 @@ protected static String createJSON(Context context, ArrayList<Categories> catego
                                        boolean isPrivate, String tag) throws FlyveException {
         try {
 
-            if(!tag.equals("")) {
-                JSONObject accountInfo = new JSONObject();
-                accountInfo.put("keyName", "TAG");
-                accountInfo.put("keyValue", tag);
-            }
-
             JSONObject jsonAccessLog = new JSONObject();
-            jsonAccessLog.put("logDate", DateFormat.format("yyyy-MM-dd H:mm:ss", new Date()).toString());
-            jsonAccessLog.put("userId", "N/A");
+            jsonAccessLog.put("logDate", DateFormat.format("yyyy-MM-dd HH:mm:ss", new Date()).toString());
+            jsonAccessLog.put("userId", "");
 
             jsonAccessLog.put("keyname", "TAG");
-            jsonAccessLog.put("keyvalue", "N/A");
+            jsonAccessLog.put("keyvalue", tag);
 
             JSONObject content = new JSONObject();
             content.put("accessLog", jsonAccessLog);
@@ -263,7 +257,7 @@ protected static String createXML(Context context, ArrayList<Categories> categor
                 serializer.startTag(null, "ACCESSLOG");
 
                 serializer.startTag(null, "LOGDATE");
-                serializer.text(DateFormat.format("yyyy-MM-dd H:mm:ss", new Date()).toString());
+                serializer.text(DateFormat.format("yyyy-MM-dd HH:mm:ss", new Date()).toString());
                 serializer.endTag(null, "LOGDATE");
 
                 serializer.startTag(null, "USERID");
@@ -273,16 +267,6 @@ protected static String createXML(Context context, ArrayList<Categories> categor
                 serializer.endTag(null, "ACCESSLOG");
                 // End ACCESSLOG
 
-                if(!tag.equals("")) {
-                    serializer.startTag(null, "ACCOUNTINFO");
-                    serializer.startTag(null, "KEYNAME");
-                    serializer.text("TAG");
-                    serializer.endTag(null, "KEYNAME");
-                    serializer.startTag(null, "KEYVALUE");
-                    serializer.text(tag);
-                    serializer.endTag(null, "KEYVALUE");
-                    serializer.endTag(null, "ACCOUNTINFO");
-                }
 
                 for (Categories cat : categories) {
                     if(isPrivate) {

inventory/src/main/java/org/flyve/inventory/categories/Category.java

@@ -121,7 +121,10 @@ public CategoryValue put(String key, CategoryValue value) {
        if (value != null) {
            if (value.getCategory() == null) {
                String s = value.getValue();
-               if (s != null && !s.equals("") && !s.equals(Build.UNKNOWN)){
+               if (s != null && !s.equals(Build.UNKNOWN)){
+                   if(s.equalsIgnoreCase("N/A") || s.equalsIgnoreCase("N\\/A")){
+                       value.setValue("");
+                   }
                    return super.put(key, value);
                } else if (value.getValues() != null && value.getValues().size() > 0) {
                    return super.put(key, value);

inventory/src/main/java/org/flyve/inventory/categories/CategoryValue.java

@@ -141,6 +141,10 @@ public String getValue() {
         return value;
     }
 
+    public void setValue(String newValue) {
+        this.value = newValue;
+    }
+
     public String getJsonName() {
         return jsonName;
     }

inventory/src/main/java/org/flyve/inventory/categories/Hardware.java

@@ -150,7 +150,7 @@ public String getDateLastLoggedUser() {
         try {
             String lastLoggedIn = getUserTagValue("lastLoggedIn");
             if (!"N/A".equals(lastLoggedIn)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm", Locale.getDefault());
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss", Locale.getDefault());
                 Date resultDate = new Date(Long.parseLong(lastLoggedIn));
                 value = sdf.format(resultDate);
             }

inventory/src/main/java/org/flyve/inventory/categories/Networks.java

@@ -67,6 +67,7 @@ public class Networks extends Categories {
 
 	// Properties of this component
 	private static final String TYPE = "WIFI";
+	private static final String NO_DECSRIPTION_PROVIDED = "No description found";
 	private DhcpInfo dhcp;
 	private WifiInfo wifi;
 	private final Context context;
@@ -341,6 +342,10 @@ public String getDescription() {
 		} catch (Exception ex) {
 			FlyveLog.e(FlyveLog.getMessage(context, CommonErrorType.NETWORKS_DESCRIPTION, ex.getMessage()));
 		}
+
+		//change name
+		name = NO_DECSRIPTION_PROVIDED;
+
 		return name;
 	}
 

inventory/src/main/java/org/flyve/inventory/categories/OperatingSystem.java

@@ -182,7 +182,7 @@ public String getBootTime() {
         String value = "N/A";
         try {
             long milliSeconds = System.currentTimeMillis() - SystemClock.elapsedRealtime();
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm", Locale.getDefault());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss", Locale.getDefault());
             Date resultDate = new Date(milliSeconds);
             value = sdf.format(resultDate);
         } catch (Exception ex) {

inventory/src/main/java/org/flyve/inventory/categories/Sensors.java

@@ -70,7 +70,7 @@ public Sensors(Context xCtx) {
 				Category c = new Category("SENSORS", "sensors");
 
 				c.put("NAME", new CategoryValue(getName(s), "NAME", "name"));
-				c.put("MANUFACTURER", new CategoryValue(getManufacturer(s), "NAME", "manufacturer"));
+				c.put("MANUFACTURER", new CategoryValue(getManufacturer(s), "MANUFACTURER", "manufacturer"));
 				c.put("TYPE", new CategoryValue(getType(s), "TYPE", "type"));
 				c.put("POWER", new CategoryValue(getPower(s), "POWER", "power"));
 				c.put("VERSION", new CategoryValue(getVersion(s), "VERSION", "version"));