mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

further merge fixes

Browse source
This commit is contained in:
AndyScherzinger 2016-11-02 00:34:54 +01:00
parent d912bd2dce
commit d713294cf0
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/owncloud/android/services/SyncedFolderJobService.java
View file

@ -36,7 +36,7 @@ import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.operations.UploadFileOperation;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimetypeIconUtil;
import com.owncloud.android.utils.MimeTypeUtil;
import java.io.File;
@ -63,7 +63,7 @@ public class SyncedFolderJobService extends JobService {
Integer uploadBehaviour = bundle.getInt("uploadBehaviour");
File file = new File(filePath);
String mimeType = MimetypeIconUtil.getBestMimeTypeByFilename(file.getAbsolutePath());
String mimeType = MimeTypeUtil.getBestMimeTypeByFilename(file.getAbsolutePath());
FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
requester.uploadNewFile(