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

Fix parsing connectionServiceStatus (#49)

Browse source 
* Catch failures on gson-parsing SystemInfo

* Fix parsing connectionServiceStatus on recent syncthing version

* Add SystemStatusConnectionServiceStatusElement to model
This commit is contained in:
Catfriend1 2018-09-14 21:05:51 +02:00 committed by GitHub
parent 8a5e5d7e47
commit bdce748ac4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nutomic/syncthingandroid/model/SystemStatus.java
View file

@ -9,7 +9,7 @@ import java.util.Map;
public class SystemStatus { public class SystemStatus {
public long alloc; public long alloc;
public double cpuPercent; public double cpuPercent;
public Map<String, Map<String, List<String>>> connectionServiceStatus; public Map<String, SystemStatusConnectionServiceStatusElement> connectionServiceStatus;
public boolean discoveryEnabled; public boolean discoveryEnabled;
public Map<String, String> discoveryErrors; public Map<String, String> discoveryErrors;
public int discoveryMethods; public int discoveryMethods;

13
app/src/main/java/com/nutomic/syncthingandroid/model/SystemStatusConnectionServiceStatusElement.java Normal file
View file

@ -0,0 +1,13 @@
package com.nutomic.syncthingandroid.model;
import java.util.List;
/**
* REST API endpoint "/rest/system/status"
* Part of JSON answer in field {@link SystemStatus#connectionServiceStatus}
*/
public class SystemStatusConnectionServiceStatusElement {
public String error;
public List<String> lanAddresses;
public List<String> wanAddresses;
}

11
app/src/main/java/com/nutomic/syncthingandroid/service/RestApi.java
View file

@ -505,8 +505,15 @@ public class RestApi {
* Requests and parses information about current system status and resource usage. * Requests and parses information about current system status and resource usage.
*/ */
public void getSystemStatus(OnResultListener1<SystemStatus> listener) { public void getSystemStatus(OnResultListener1<SystemStatus> listener) {
new GetRequest(mContext, mUrl, GetRequest.URI_SYSTEM_STATUS, mApiKey, null, result -> new GetRequest(mContext, mUrl, GetRequest.URI_SYSTEM_STATUS, mApiKey, null, result -> {
listener.onResult(new Gson().fromJson(result, SystemStatus.class))); SystemStatus systemStatus;
try {
systemStatus = new Gson().fromJson(result, SystemStatus.class);
listener.onResult(systemStatus);
} catch (Exception e) {
Log.e(TAG, "getSystemStatus: Parsing REST API result failed. result=" + result);
}
});
} }
public boolean isConfigLoaded() { public boolean isConfigLoaded() {