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

Fixed announce server status display (fixes #189).

This commit is contained in:
Felix Ableitner 2015-01-19 21:46:34 +01:00
parent 1506541796
commit 535b1f6108
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nutomic/syncthingandroid/fragments/LocalDeviceInfoFragment.java
View File

@ -141,11 +141,12 @@ public class LocalDeviceInfoFragment extends Fragment
}); });
mCpuUsage.setText(new DecimalFormat("0.00").format(info.cpuPercent) + "%"); mCpuUsage.setText(new DecimalFormat("0.00").format(info.cpuPercent) + "%");
mRamUsage.setText(RestApi.readableFileSize(mActivity, info.sys)); mRamUsage.setText(RestApi.readableFileSize(mActivity, info.sys));
if (info.extAnnounceOK) { if (info.extAnnounceConnected == info.extAnnounceTotal) {
mAnnounceServer.setText("Online"); mAnnounceServer.setText(android.R.string.ok);
mAnnounceServer.setTextColor(getResources().getColor(R.color.text_green)); mAnnounceServer.setTextColor(getResources().getColor(R.color.text_green));
} else { } else {
mAnnounceServer.setText("Offline"); mAnnounceServer.setText(Integer.toString(info.extAnnounceConnected) + "/" +
Integer.toString(info.extAnnounceTotal));
mAnnounceServer.setTextColor(getResources().getColor(R.color.text_red)); mAnnounceServer.setTextColor(getResources().getColor(R.color.text_red));
} }
} }

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

@ -29,6 +29,7 @@ import java.security.InvalidParameterException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -73,7 +74,8 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
public static class SystemInfo { public static class SystemInfo {
public long alloc; public long alloc;
public double cpuPercent; public double cpuPercent;
public boolean extAnnounceOK; public int extAnnounceConnected; // Number of connected announce servers.
public int extAnnounceTotal; // Total number of configured announce servers.
public int goroutines; public int goroutines;
public String myID; public String myID;
public long sys; public long sys;
@ -427,7 +429,15 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
SystemInfo si = new SystemInfo(); SystemInfo si = new SystemInfo();
si.alloc = system.getLong("alloc"); si.alloc = system.getLong("alloc");
si.cpuPercent = system.getDouble("cpuPercent"); si.cpuPercent = system.getDouble("cpuPercent");
si.extAnnounceOK = system.optBoolean("extAnnounceOK", false); JSONObject announce = system.getJSONObject("extAnnounceOK");
si.extAnnounceConnected = 0;
si.extAnnounceTotal = announce.length();
for (Iterator<String> it = announce.keys(); it.hasNext(); ) {
String key = it.next();
if (announce.getBoolean(key)) {
si.extAnnounceConnected++;
}
}
si.goroutines = system.getInt("goroutines"); si.goroutines = system.getInt("goroutines");
si.myID = system.getString("myID"); si.myID = system.getString("myID");
si.sys = system.getLong("sys"); si.sys = system.getLong("sys");