nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Seperate URLs in settings with comma instead of space (fixes #212).

This commit is contained in:
Felix Ableitner 2015-05-18 22:54:21 +02:00
parent d88828be82
commit 98b9029c62
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
View File

@ -297,7 +297,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
try { try {
Object value = mConfig.getJSONObject(name).get(key); Object value = mConfig.getJSONObject(name).get(key);
return (value instanceof JSONArray) return (value instanceof JSONArray)
? ((JSONArray) value).join(" ").replace("\"", "").replace("\\", "") ? ((JSONArray) value).join(", ").replace("\"", "").replace("\\", "")
: value.toString(); : value.toString();
} catch (JSONException e) { } catch (JSONException e) {
Log.w(TAG, "Failed to get value for " + key, e); Log.w(TAG, "Failed to get value for " + key, e);
@ -314,12 +314,12 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
* @param name {@link #TYPE_OPTIONS} or {@link #TYPE_GUI} * @param name {@link #TYPE_OPTIONS} or {@link #TYPE_GUI}
* @param key The key to write to. * @param key The key to write to.
* @param value The new value to set, either String, Boolean or Integer. * @param value The new value to set, either String, Boolean or Integer.
* @param isArray True iff value is a space seperated String that should be converted to array. * @param isArray True if value is a space seperated String that should be converted to array.
*/ */
public <T> void setValue(String name, String key, T value, boolean isArray, Activity activity) { public <T> void setValue(String name, String key, T value, boolean isArray, Activity activity) {
try { try {
mConfig.getJSONObject(name).put(key, (isArray) mConfig.getJSONObject(name).put(key, (isArray)
? listToJson(((String) value).split(" ")) ? listToJson(((String) value).split(","))
: value); : value);
requireRestart(activity); requireRestart(activity);
} catch (JSONException e) { } catch (JSONException e) {
@ -334,7 +334,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
private JSONArray listToJson(String[] list) { private JSONArray listToJson(String[] list) {
JSONArray json = new JSONArray(); JSONArray json = new JSONArray();
for (String s : list) { for (String s : list) {
json.put(s); json.put(s.trim());
} }
return json; return json;
} }