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

Merge branch 'master' of https://github.com/nextcloud/android into favourites

Browse source 
# Conflicts:
#	build.gradle
This commit is contained in:
AndyScherzinger 2017-03-26 00:50:02 +01:00
commit 5f0944ab78
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -182,7 +182,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'
compile 'org.greenrobot:eventbus:3.0.0'
compile 'org.parceler:parceler-api:1.1.6'

6
src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java
View file

@ -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

2
src/main/java/com/owncloud/android/utils/FileStorageUtils.java
View file

@ -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) {