Merge pull request #2553 from hieupham007/timob-8774-2_1_X

Timob 8774-2_1_X: Fixed label disappearance
tidev · Jul 12, 2012 · 57cf291 · 57cf291
2 parents c9269e7 + dcd4a8f
commit 57cf291
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java b/android/titanium/src/java/org/appcelerator/kroll/KrollProxy.java
@@ -320,6 +320,9 @@ private Pair<String, String> updateLocaleProperty(String localeProperty, String
 			if (entry.getValue().toString().equals(localeProperty)) {
 				String targetProperty = entry.getKey();
 				String localizedValue = getLocalizedText(newLookupId);
+				if (localizedValue == null) {
+					return null;
+				}
 				setProperty(targetProperty, localizedValue);
 
 				return Pair.create(targetProperty, localizedValue);
@@ -350,10 +353,14 @@ private String getLocalizedText(String lookupId)
 	{
 		try {
 			int resid = TiRHelper.getResource("string." + lookupId);
-			return getActivity().getString(resid);
+			if (resid != 0) {
+				return getActivity().getString(resid);
+			} 
+			return null;
+
 		} catch (TiRHelper.ResourceNotFoundException e) {
 			return null;
-		}
+		} 
 	}
 
 	/**
@@ -703,7 +710,9 @@ public void onPropertyChanged(String name, Object value)
 
 		Object oldValue = properties.get(propertyName);
 		properties.put(propertyName, newValue);
-		firePropertyChanged(propertyName, oldValue, newValue);
+		if (shouldFireChange(oldValue, newValue)) {
+			firePropertyChanged(propertyName, oldValue, newValue);
+		}
 	}
 
 	public void onPropertiesChanged(Object[][] changes)