Fix path for files

src/com/owncloud/android/services/observer/SyncedFolderObserverService.java

@@ -26,7 +26,6 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
-import android.util.Log;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.SyncedFolder;
@@ -88,7 +87,6 @@ public class SyncedFolderObserverService extends Service {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.d("MARIO", "DESTROY");
         for(FileAlterationObserver fileAlterationObserver : monitor.getObservers()) {
             FileAlterationMagicObserver fileAlterationMagicObserver = (FileAlterationMagicObserver)
                     fileAlterationObserver;

src/com/owncloud/android/utils/FileStorageUtils.java

@@ -167,7 +167,7 @@ public class FileStorageUtils {
         if (subfolderByDate) {
            subPath = getSubpathFromDate(dateTaken, current);
         }
-        return remotePath + OCFile.PATH_SEPARATOR + subPath + (fileName == null ? "" : fileName);
+        return remotePath + subPath + (fileName == null ? "" : fileName);
     }
 
     public static String getInstantUploadFilePath(String remotePath, String fileName, long dateTaken,
@@ -176,7 +176,7 @@ public class FileStorageUtils {
         if (subfolderByDate) {
             subPath = getSubpathFromDate(dateTaken);
         }
-        return remotePath + OCFile.PATH_SEPARATOR + subPath + (fileName == null ? "" : fileName);
+        return remotePath + subPath + (fileName == null ? "" : fileName);
     }
 
 
@@ -194,7 +194,7 @@ public class FileStorageUtils {
         if (com.owncloud.android.db.PreferenceManager.instantVideoUploadPathUseSubfolders(context)) {
             subPath = getSubpathFromDate(dateTaken);
         }
-        return uploadVideoPath + OCFile.PATH_SEPARATOR + subPath
+        return uploadVideoPath + subPath
                 + (fileName == null ? "" : fileName);
     }