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

Merge branch 'Zillode-do-not-scare-ppl'

This commit is contained in:
Felix Ableitner 2015-03-17 22:38:16 +01:00
parent b7459c9ded c3e4ff4cb1
commit 34bded841d
1 changed files with 3 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/fragments/DrawerFragment.java
View File

@ -182,12 +182,11 @@ public class DrawerFragment extends Fragment implements RestApi.OnReceiveSystemI
}); });
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.extAnnounceConnected == info.extAnnounceTotal) {
mAnnounceServer.setText(android.R.string.ok);
mAnnounceServer.setTextColor(getResources().getColor(R.color.text_green));
} else {
mAnnounceServer.setText(Integer.toString(info.extAnnounceConnected) + "/" + mAnnounceServer.setText(Integer.toString(info.extAnnounceConnected) + "/" +
Integer.toString(info.extAnnounceTotal)); Integer.toString(info.extAnnounceTotal));
if (info.extAnnounceConnected > 0) {
mAnnounceServer.setTextColor(getResources().getColor(R.color.text_green));
} else {
mAnnounceServer.setTextColor(getResources().getColor(R.color.text_red)); mAnnounceServer.setTextColor(getResources().getColor(R.color.text_red));
} }
} }