Skip to content

Commit

Permalink
Fix override/revert showing up with no changes on extSdCard synced fo…
Browse files Browse the repository at this point in the history
…lders (fixes #454) (#455)

* Update build_and_release.cmd

* Update SyncthingNative_update_and_build.cmd

* Update APK version to 1.2.1.0

* build-syncthing.py: Set version to v1.2.1-preview4-mtime

* model/Folder: Add "rawModTimeWindowS"

* Update Folder.java

* Update ConfigXml.java

* Update SyncthingNative_update_and_build.cmd

* Update build-syncthing.py

* Revert "Update build-syncthing.py"

This reverts commit f8a3a23.

* Revert "Update SyncthingNative_update_and_build.cmd"

This reverts commit ee892de.

* Revert "build-syncthing.py: Set version to v1.2.1-preview4-mtime"

This reverts commit a01ceb2.

* Revert "Update SyncthingNative_update_and_build.cmd"

This reverts commit 493da15.

* Revert "Update build_and_release.cmd"

This reverts commit b6f47f0.
  • Loading branch information
Catfriend1 authored Aug 4, 2019
1 parent c84f62f commit 2c11e82
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public class Folder {
// Since v1.1.0, see Issue #5445, PR #5479
public Boolean copyOwnershipFromParent = false;

// Since v1.2.1-rc.4, see PR #5852
public int modTimeWindowS = 0;

// Folder Status
public String invalid;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ public List<Folder> getFolders() {
folder.paused = getContentOrDefault(r.getElementsByTagName("paused").item(0), folder.paused);
folder.ignoreDelete = getContentOrDefault(r.getElementsByTagName("ignoreDelete").item(0), folder.ignoreDelete);
folder.copyOwnershipFromParent = getContentOrDefault(r.getElementsByTagName("copyOwnershipFromParent").item(0), folder.copyOwnershipFromParent);
folder.modTimeWindowS = getContentOrDefault(r.getElementsByTagName("modTimeWindowS").item(0), folder.modTimeWindowS);

// Devices
/*
Expand Down Expand Up @@ -540,6 +541,8 @@ public void updateFolder(final Folder folder) {
setConfigElement(r, "order", folder.order);
setConfigElement(r, "paused", Boolean.toString(folder.paused));
setConfigElement(r, "ignoreDelete", Boolean.toString(folder.ignoreDelete));
setConfigElement(r, "copyOwnershipFromParent", Boolean.toString(folder.copyOwnershipFromParent));
setConfigElement(r, "modTimeWindowS", Integer.toString(folder.modTimeWindowS));

// Update devices that share this folder.
// Pass 1: Remove all devices below that folder in XML except the local device.
Expand Down

0 comments on commit 2c11e82

Please sign in to comment.