|
@@ -46,7 +46,7 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
private boolean mSyncFileContents;
|
|
private boolean mSyncFileContents;
|
|
private Context mContext;
|
|
private Context mContext;
|
|
private boolean mTransferWasRequested;
|
|
private boolean mTransferWasRequested;
|
|
- private boolean syncForInternalTwoWaySyncWorker;
|
|
|
|
|
|
+ private final boolean syncInBackgroundWorker;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -77,7 +77,7 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
boolean syncFileContents,
|
|
boolean syncFileContents,
|
|
Context context,
|
|
Context context,
|
|
FileDataStorageManager storageManager,
|
|
FileDataStorageManager storageManager,
|
|
- boolean syncForInternalTwoWaySyncWorker) {
|
|
|
|
|
|
+ boolean syncInBackgroundWorker) {
|
|
super(storageManager);
|
|
super(storageManager);
|
|
|
|
|
|
mRemotePath = remotePath;
|
|
mRemotePath = remotePath;
|
|
@@ -87,7 +87,7 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
mSyncFileContents = syncFileContents;
|
|
mSyncFileContents = syncFileContents;
|
|
mContext = context;
|
|
mContext = context;
|
|
mAllowUploads = true;
|
|
mAllowUploads = true;
|
|
- this.syncForInternalTwoWaySyncWorker = syncForInternalTwoWaySyncWorker;
|
|
|
|
|
|
+ this.syncInBackgroundWorker = syncInBackgroundWorker;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -115,7 +115,7 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
boolean syncFileContents,
|
|
boolean syncFileContents,
|
|
Context context,
|
|
Context context,
|
|
FileDataStorageManager storageManager,
|
|
FileDataStorageManager storageManager,
|
|
- boolean syncForInternalTwoWaySyncWorker) {
|
|
|
|
|
|
+ boolean syncInBackgroundWorker) {
|
|
super(storageManager);
|
|
super(storageManager);
|
|
|
|
|
|
mLocalFile = localFile;
|
|
mLocalFile = localFile;
|
|
@@ -135,7 +135,7 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
mSyncFileContents = syncFileContents;
|
|
mSyncFileContents = syncFileContents;
|
|
mContext = context;
|
|
mContext = context;
|
|
mAllowUploads = true;
|
|
mAllowUploads = true;
|
|
- this.syncForInternalTwoWaySyncWorker = syncForInternalTwoWaySyncWorker;
|
|
|
|
|
|
+ this.syncInBackgroundWorker = syncInBackgroundWorker;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -166,8 +166,8 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
boolean allowUploads,
|
|
boolean allowUploads,
|
|
Context context,
|
|
Context context,
|
|
FileDataStorageManager storageManager,
|
|
FileDataStorageManager storageManager,
|
|
- boolean syncForInternalTwoWaySyncWorker) {
|
|
|
|
- this(localFile, serverFile, user, syncFileContents, context, storageManager, syncForInternalTwoWaySyncWorker);
|
|
|
|
|
|
+ boolean syncInBackgroundWorker) {
|
|
|
|
+ this(localFile, serverFile, user, syncFileContents, context, storageManager, syncInBackgroundWorker);
|
|
mAllowUploads = allowUploads;
|
|
mAllowUploads = allowUploads;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -301,7 +301,7 @@ public class SynchronizeFileOperation extends SyncOperation {
|
|
}
|
|
}
|
|
|
|
|
|
private void requestForDownload(OCFile file) {
|
|
private void requestForDownload(OCFile file) {
|
|
- if (syncForInternalTwoWaySyncWorker) {
|
|
|
|
|
|
+ if (syncInBackgroundWorker) {
|
|
Log_OC.d("InternalTwoWaySyncWork", "download file: " + file.getFileName());
|
|
Log_OC.d("InternalTwoWaySyncWork", "download file: " + file.getFileName());
|
|
|
|
|
|
try {
|
|
try {
|