Merge branch 'develop'

# Conflicts:
#	iOSClient/Brand/NCBrand.swift
#	iOSClient/Supporting Files/cs-CZ.lproj/BKPasscodeView.strings
#	iOSClient/Supporting Files/cs-CZ.lproj/Intro.strings

File Provider Extension/FileProviderData.swift

@@ -3,7 +3,7 @@
 //  Files
 //
 //  Created by Marino Faggiana on 27/05/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

File Provider Extension/FileProviderEnumerator.swift

@@ -3,7 +3,7 @@
 //  Files
 //
 //  Created by Marino Faggiana on 26/03/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

File Provider Extension/FileProviderExtension+Actions.swift

@@ -3,7 +3,7 @@
 //  PickerFileProvider
 //
 //  Created by Marino Faggiana on 28/05/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

File Provider Extension/FileProviderExtension+Network.swift

@@ -3,7 +3,7 @@
 //  PickerFileProvider
 //
 //  Created by Marino Faggiana on 28/05/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //
@@ -32,7 +32,10 @@ extension FileProviderExtension {
     func deleteFile(withIdentifier itemIdentifier: NSFileProviderItemIdentifier, parentItemIdentifier: NSFileProviderItemIdentifier, metadata: tableMetadata, serverUrl: String) {
         
         let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)
-        ocNetworking?.deleteFileOrFolder(metadata.fileName, serverUrl: serverUrl, completion: { (message, errorCode) in
+        
+        let path = serverUrl + "/" + metadata.fileName
+        
+        ocNetworking?.deleteFileOrFolder(path, completion: { (message, errorCode) in
             
             if errorCode == 0 || errorCode == 404 {
                 self.deleteFileSystem(for: metadata, serverUrl: serverUrl, itemIdentifier: itemIdentifier)

File Provider Extension/FileProviderExtension+Thumbnail.swift

@@ -3,7 +3,7 @@
 //  PickerFileProvider
 //
 //  Created by Marino Faggiana on 28/05/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

File Provider Extension/FileProviderExtension-Bridging-Header.h

@@ -3,7 +3,7 @@
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 24/05/17.
-//  Copyright © 2017 TWS. All rights reserved.
+//  Copyright © 2017 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

File Provider Extension/FileProviderExtension.swift

@@ -3,7 +3,7 @@
 //  Files
 //
 //  Created by Marino Faggiana on 26/03/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

File Provider Extension/FileProviderItem.swift

@@ -3,7 +3,7 @@
 //  Files
 //
 //  Created by Marino Faggiana on 26/03/18.
-//  Copyright © 2018 TWS. All rights reserved.
+//  Copyright © 2018 Marino Faggiana. All rights reserved.
 //
 //  Author Marino Faggiana <m.faggiana@twsweb.it>
 //

iOSClient/Library/CTAssetsPickerController/CTAssetCollectionViewCell.h → Libraries external/CTAssetsPickerController/CTAssetCollectionViewCell.h

@@ -28,7 +28,7 @@
 #import <Photos/Photos.h>
 #import "CTAssetThumbnailStacks.h"
 
-NS_ASSUME_NONNULL_BEGIN
+
 
 @interface CTAssetCollectionViewCell : UITableViewCell
 
@@ -51,6 +51,4 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithThumbnailSize:(CGSize)size reuseIdentifier:(nullable NSString *)reuseIdentifier;
 - (void)bind:(nonnull PHAssetCollection *)collection count:(NSUInteger)count;
 
-@end
-
-NS_ASSUME_NONNULL_END
+@end

iOSClient/Library/CTAssetsPickerController/CTAssetThumbnailStacks.h → Libraries external/CTAssetsPickerController/CTAssetThumbnailStacks.h

@@ -27,8 +27,6 @@
 #import <UIKit/UIKit.h>
 #import "CTAssetThumbnailView.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
 @interface CTAssetThumbnailStacks : UIView
 
 @property (nonatomic, assign) CGSize thumbnailSize;
@@ -39,5 +37,3 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setHighlighted:(BOOL)highlighted;
 
 @end
-
-NS_ASSUME_NONNULL_END

iOSClient/Library/CTAssetsPickerController/CTAssetsGridViewController.h → Libraries external/CTAssetsPickerController/CTAssetsGridViewController.h

@@ -42,7 +42,7 @@
 
 @interface CTAssetsGridViewController : UICollectionViewController
 
-@property (nonatomic, weak, nullable) id<CTAssetsGridViewControllerDelegate> delegate;
+@property (nonatomic, weak) id<CTAssetsGridViewControllerDelegate> delegate;
 @property (nonatomic, strong, nonnull) PHAssetCollection *assetCollection;
 
 @end