github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-1743: Globalization.getDateNames will crash Android 2.2 applications

Browse Source
This commit is contained in:
Simon MacDonald 2012-10-25 10:35:22 -04:00
parent 58f58d9ee8
commit a2f35d2bda
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/org/apache/cordova/Globalization.java
View File

@ -40,6 +40,7 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.annotation.TargetApi;
import android.text.format.Time; import android.text.format.Time;
/** /**
@ -101,7 +102,11 @@ public class Globalization extends CordovaPlugin {
}else if(action.equalsIgnoreCase(GETDATEPATTERN)){ }else if(action.equalsIgnoreCase(GETDATEPATTERN)){
obj = getDatePattern(data); obj = getDatePattern(data);
}else if(action.equalsIgnoreCase(GETDATENAMES)){ }else if(action.equalsIgnoreCase(GETDATENAMES)){
obj = getDateNames(data); if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.GINGERBREAD) {
throw new GlobalizationError(GlobalizationError.UNKNOWN_ERROR);
} else {
obj = getDateNames(data);
}
}else if(action.equalsIgnoreCase(ISDAYLIGHTSAVINGSTIME)){ }else if(action.equalsIgnoreCase(ISDAYLIGHTSAVINGSTIME)){
obj = getIsDayLightSavingsTime(data); obj = getIsDayLightSavingsTime(data);
}else if(action.equalsIgnoreCase(GETFIRSTDAYOFWEEK)){ }else if(action.equalsIgnoreCase(GETFIRSTDAYOFWEEK)){
@ -305,6 +310,7 @@ public class Globalization extends CordovaPlugin {
* *
* @throws: GlobalizationError.UNKNOWN_ERROR * @throws: GlobalizationError.UNKNOWN_ERROR
*/ */
@TargetApi(9)
private JSONObject getDateNames(JSONArray options) throws GlobalizationError{ private JSONObject getDateNames(JSONArray options) throws GlobalizationError{
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
//String[] value; //String[] value;