nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-09 11:41:29 +00:00
Code Releases Activity

Add model/Folder#CopyOwnershipFromParent (fixes #286) (#287)

Browse source 
* Add model/Folder#CopyOwnershipFromParent (fixes #286)

See https://github.com/syncthing/syncthing/pull/5479/files

* Fix typo, update doc ref

* Update ConfigXml
This commit is contained in:
Catfriend1 2019-03-05 23:40:42 +01:00 committed by GitHub
parent c1abb476b6
commit 5151c3485b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/nutomic/syncthingandroid/model/Folder.java
View file

@ -11,6 +11,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
/**
* Sources:
* - https://github.com/syncthing/syncthing/tree/master/lib/config
* - https://github.com/syncthing/syncthing/blob/master/lib/config/folderconfiguration.go
*/
public class Folder {
// Folder Configuration
@ -42,6 +47,9 @@ public class Folder {
public int weakHashThresholdPct = 25;
public String markerName = ".stfolder";
// Since v1.1.0, see Issue #5445, PR #5479
public Boolean copyOwnershipFromParent = false;
// Folder Status
public String invalid;

1
app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
View file

@ -436,6 +436,7 @@ public class ConfigXml {
folder.order = getContentOrDefault(r.getElementsByTagName("order").item(0), "random");
folder.paused = getContentOrDefault(r.getElementsByTagName("paused").item(0), false);
folder.useLargeBlocks = getContentOrDefault(r.getElementsByTagName("useLargeBlocks").item(0), false);
folder.copyOwnershipFromParent = getContentOrDefault(r.getElementsByTagName("copyOwnershipFromParent").item(0), false);
// Devices
/*