Merge pull request #240 from pec1985/timob-12879

[TIMOB-12879] Fixed Ti.App.Properties
appcelerator-archive · May 22, 2014 · 89cec62 · 89cec62
2 parents 18733ad + c0ea7cc
commit 89cec62
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/tibb/src/Modules/App/TiAppPropertiesModule.cpp b/src/tibb/src/Modules/App/TiAppPropertiesModule.cpp
@@ -115,6 +115,13 @@ QMap<QString, Ti::TiValue> TiAppPropertiesModule::createMapFromQVariant(QVariant
 				map.insert(key, newVal);
 				break;
 			}
+			case QVariant::Map:
+			{
+				Ti::TiValue newVal;
+				newVal.setMap(createMapFromQVariant(current.toMap()));
+				map.insert(key, newVal);
+				break;
+			}
 			default:
 			{
 				Ti::TiValue newVal;
@@ -159,6 +166,13 @@ QList<Ti::TiValue> TiAppPropertiesModule::createListFromQVariant(QVariant val)
 				list.append(newVal);
 				break;
 			}
+			case QVariant::Map:
+			{
+				Ti::TiValue newVal;
+				newVal.setMap(createMapFromQVariant(current.toMap()));
+				list.append(newVal);
+				break;
+			}
 			default:
 			{
 				Ti::TiValue newVal;
@@ -267,6 +281,10 @@ void TiAppPropertiesModule::setProp(Ti::TiValue value, PropertyType type)
 	Ti::TiValue key = values.at(0);
 	Ti::TiValue prop = values.at(1);
 
+	if(prop.isNull() || prop.isUndefined()) {
+		setProp(key, TiAppPropertiesModule::RemoveProperty);
+		return;
+	}
 	settings.setValue(key.toString(), convertTiValueToQVariant(prop, type));
 }
 
@@ -297,7 +315,6 @@ Ti::TiValue TiAppPropertiesModule::getProp(Ti::TiValue value, PropertyType type)
 	{
 		if(prop.isValid())
 		{
-			settings.setValue(key, prop);
 			return convertQVariantToTiValue(prop, type);
 		}
 		QSettings defaultSettings("app/native/_private_assets_/app_properties.ini", QSettings::IniFormat);
@@ -307,7 +324,7 @@ Ti::TiValue TiAppPropertiesModule::getProp(Ti::TiValue value, PropertyType type)
 		}
 	}
 	Ti::TiValue val;
-	val.setUndefined();
+	val.setNull();
 	return val;
 }