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

Merge pull request #740 from capi/syncthing-v0.14.6 

Update to Syncthing v0.14.6
This commit is contained in:
Felix Ableitner 2016-09-13 22:47:47 +02:00 committed by GitHub
parent ef297a7df1 ebc0fe88de
commit 1abf1323d6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 1188ebbb7b0f4545da4bcfceeb63d3c3ce6bb4ee Subproject commit 7569b75d61cb7a1f964f09aafa1c87d86554f377

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

@ -157,6 +157,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
public long inSyncFiles; public long inSyncFiles;
public long needBytes; public long needBytes;
public long needFiles; public long needFiles;
public long needDeletes;
public String state; public String state;
public String invalid; public String invalid;
} }
@ -666,6 +667,8 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
private int getDeviceCompletion(String deviceId) { private int getDeviceCompletion(String deviceId) {
int folderCount = 0; int folderCount = 0;
float percentageSum = 0; float percentageSum = 0;
// Syncthing UI limits pending deletes to 95% completion of a device
int maxPercentage = 100;
for (Map.Entry<String, Model> modelInfo : mCachedModelInfo.entrySet()) { for (Map.Entry<String, Model> modelInfo : mCachedModelInfo.entrySet()) {
boolean isShared = false; boolean isShared = false;
outerloop: outerloop:
@ -681,6 +684,8 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
if (isShared) { if (isShared) {
long global = modelInfo.getValue().globalBytes; long global = modelInfo.getValue().globalBytes;
long local = modelInfo.getValue().inSyncBytes; long local = modelInfo.getValue().inSyncBytes;
if (modelInfo.getValue().needFiles == 0 && modelInfo.getValue().needDeletes > 0)
maxPercentage = 95;
percentageSum += (global != 0) percentageSum += (global != 0)
? (local * 100f) / global ? (local * 100f) / global
: 100f; : 100f;
@ -688,7 +693,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
} }
} }
return (folderCount != 0) return (folderCount != 0)
? Math.round(percentageSum / folderCount) ? Math.min(Math.round(percentageSum / folderCount), maxPercentage)
: 100; : 100;
} }
@ -744,6 +749,7 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
m.inSyncFiles = json.getLong("inSyncFiles"); m.inSyncFiles = json.getLong("inSyncFiles");
m.needBytes = json.getLong("needBytes"); m.needBytes = json.getLong("needBytes");
m.needFiles = json.getLong("needFiles"); m.needFiles = json.getLong("needFiles");
m.needDeletes = json.getLong("needDeletes");
m.state = json.getString("state"); m.state = json.getString("state");
m.invalid = json.optString("invalid"); m.invalid = json.optString("invalid");
mCachedModelInfo.put(folderId, m); mCachedModelInfo.put(folderId, m);