nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 22:31:16 +00:00
Code Releases Activity

Fixed deleting folders not working.

Browse source
This commit is contained in:
Felix Ableitner 2014-10-12 16:00:57 +03:00
parent d993f1917f
commit 9940f5c437
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
View file

@ -812,13 +812,13 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
*/ */
public boolean deleteFolder(Folder folder, Activity activity) { public boolean deleteFolder(Folder folder, Activity activity) {
try { try {
JSONArray folders = mConfig.getJSONArray("Folder"); JSONArray folders = mConfig.getJSONArray("Folders");
for (int i = 0; i < folders.length(); i++) { for (int i = 0; i < folders.length(); i++) {
JSONObject json = folders.getJSONObject(i); JSONObject json = folders.getJSONObject(i);
if (folder.ID.equals(json.getString("ID"))) { if (folder.ID.equals(json.getString("ID"))) {
mConfig.remove("Folder"); mConfig.remove("Folders");
mConfig.put("Folder", delete(folders, folders.getJSONObject(i))); mConfig.put("Folders", delete(folders, folders.getJSONObject(i)));
break; break;
} }
} }
@ -868,7 +868,6 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
String error = null; String error = null;
try { try {
JSONObject json = new JSONObject(s); JSONObject json = new JSONObject(s);
Log.d(TAG, s);
normalized = json.optString("id", null); normalized = json.optString("id", null);
error = json.optString("error", null); error = json.optString("error", null);
} catch (JSONException e) { } catch (JSONException e) {

1
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
View file

@ -353,6 +353,7 @@ public class SyncthingService extends Service {
} }
Log.i(TAG, "Web GUI has come online at " + mConfig.getWebGuiUrl()); Log.i(TAG, "Web GUI has come online at " + mConfig.getWebGuiUrl());
mCurrentState = State.ACTIVE; mCurrentState = State.ACTIVE;
onApiChange();
for (OnWebGuiAvailableListener listener : mOnWebGuiAvailableListeners) { for (OnWebGuiAvailableListener listener : mOnWebGuiAvailableListeners) {
listener.onWebGuiAvailable(); listener.onWebGuiAvailable();
} }