1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-02-04 08:11:37 +00:00

Merge branch 'master' of https://github.com/syncthing/syncthing-android into newRunCondUI

This commit is contained in:
Catfriend1 2018-07-26 22:07:29 +02:00
commit b040a6e4bc

View file

@ -572,6 +572,7 @@ public class FolderActivity extends SyncthingActivity
} }
return sb.toString(); return sb.toString();
} }
private void initFolder() { private void initFolder() {
mFolder = new Folder(); mFolder = new Folder();
mFolder.id = (getIntent().hasExtra(EXTRA_FOLDER_ID)) mFolder.id = (getIntent().hasExtra(EXTRA_FOLDER_ID))
@ -586,6 +587,7 @@ public class FolderActivity extends SyncthingActivity
*/ */
mFolder.rescanIntervalS = 3600; mFolder.rescanIntervalS = 3600;
mFolder.paused = false; mFolder.paused = false;
mFolder.type = Constants.FOLDER_TYPE_SEND_RECEIVE;
mFolder.versioning = new Folder.Versioning(); mFolder.versioning = new Folder.Versioning();
} }