From c6d6fc82f02d07eb2863eded1a9bff21abe6fb82 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 23 Mar 2017 20:58:55 +0100 Subject: [PATCH 1/2] Update android job --- build.gradle | 2 +- .../com/owncloud/android/files/BootupBroadcastReceiver.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0550bd4ead..225738017f 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,7 @@ dependencies { compile 'com.google.code.findbugs:annotations:2.0.1' compile group: 'commons-io', name: 'commons-io', version: '2.4' compile 'com.google.android.gms:play-services:10.2.0' - compile 'com.github.evernote:android-job:v1.1.7' + compile 'com.github.evernote:android-job:v1.1.8' /// dependencies for local unit tests testCompile 'junit:junit:4.12' diff --git a/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java b/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java index d4921f337d..3e89be4afa 100644 --- a/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java +++ b/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java @@ -21,13 +21,13 @@ package com.owncloud.android.files; -import com.owncloud.android.lib.common.utils.Log_OC; -import com.owncloud.android.services.observer.FileObserverService; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import com.owncloud.android.lib.common.utils.Log_OC; +import com.owncloud.android.services.observer.FileObserverService; + /** * App-registered receiver catching the broadcast intent reporting that the system was From 0258811e859a10666d019c56c7409157ac483943 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 24 Mar 2017 14:04:21 +0100 Subject: [PATCH 2/2] Fix video upload path --- src/main/java/com/owncloud/android/utils/FileStorageUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/src/main/java/com/owncloud/android/utils/FileStorageUtils.java index fafb31f9d3..eb0b757fba 100644 --- a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java +++ b/src/main/java/com/owncloud/android/utils/FileStorageUtils.java @@ -200,7 +200,7 @@ public class FileStorageUtils { if (com.owncloud.android.db.PreferenceManager.instantVideoUploadPathUseSubfolders(context)) { subPath = getSubpathFromDate(dateTaken); } - return uploadVideoPath + subPath + (fileName == null ? "" : fileName); + return uploadVideoPath + OCFile.PATH_SEPARATOR + subPath + (fileName == null ? "" : fileName); } public static String getParentPath(String remotePath) {