|
@@ -2,7 +2,7 @@
|
|
* ownCloud Android client application
|
|
* ownCloud Android client application
|
|
*
|
|
*
|
|
* @author David A. Velasco
|
|
* @author David A. Velasco
|
|
- * Copyright (C) 2016 ownCloud Inc.
|
|
|
|
|
|
+ * Copyright (C) 2016 ownCloud GmbH.
|
|
*
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2,
|
|
* it under the terms of the GNU General Public License version 2,
|
|
@@ -383,7 +383,7 @@ public class UploadFileOperation extends SyncOperation {
|
|
mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict(), timeStamp);
|
|
mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict(), timeStamp);
|
|
} else {
|
|
} else {
|
|
mUploadOperation = new UploadRemoteFileOperation(mFile.getStoragePath(),
|
|
mUploadOperation = new UploadRemoteFileOperation(mFile.getStoragePath(),
|
|
- mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict());
|
|
|
|
|
|
+ mFile.getRemotePath(), mFile.getMimetype(), mFile.getEtagInConflict(), timeStamp);
|
|
}
|
|
}
|
|
Iterator <OnDatatransferProgressListener> listener = mDataTransferListeners.iterator();
|
|
Iterator <OnDatatransferProgressListener> listener = mDataTransferListeners.iterator();
|
|
while (listener.hasNext()) {
|
|
while (listener.hasNext()) {
|