corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 920855 - Replace java.net.URL with java.net.URI wherever possible. r=rnewman

Browse Source
This commit is contained in:
Clemens Wilding
2014-04-16 08:42:15 -07:00
parent 378337e25e
commit f2ee4ae94d
6 changed files with 32 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mobile/android/base/util/JSONUtils.java
View File

@@ -4,43 +4,14 @@
package org.mozilla.gecko.util;
import java.util.UUID;
import org.json.JSONException;
import org.json.JSONObject;
import android.util.Log;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.UUID;
public final class JSONUtils {
private static final String LOGTAG = "JSONUtils";
private JSONUtils() {}
public static URL getURL(String name, JSONObject json) {
String url = json.optString(name, null);
if (url == null) {
return null;
}
try {
return new URL(url);
} catch (MalformedURLException e) {
Log.e(LOGTAG, "", new IllegalStateException(name + "=" + url, e));
return null;
}
}
public static void putURL(String name, URL url, JSONObject json) {
String urlString = url.toString();
try {
json.put(name, urlString);
} catch (JSONException e) {
throw new IllegalArgumentException(name + "=" + urlString, e);
}
}
public static UUID getUUID(String name, JSONObject json) {
String uuid = json.optString(name, null);
return (uuid != null) ? UUID.fromString(uuid) : null;