Skip to content

Commit 42dd575

Browse files
harshada-15-tsysharshada-15-tsys
committed
NMC 1997 - Sharing customisation changes
1 parent f4e6be8 commit 42dd575

14 files changed

Lines changed: 153 additions & 89 deletions

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,23 @@
9191
AFCE353327E4ED1900FEA6C2 /* UIToolbar+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353227E4ED1900FEA6C2 /* UIToolbar+Extension.swift */; };
9292
AFCE353527E4ED5900FEA6C2 /* DateFormatter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */; };
9393
AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */; };
94-
AFCE353927E5DE0500FEA6C2 /* Shareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* Shareable.swift */; };
94+
AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */; };
95+
B5E2E6D42DAE52B500AB2EDD /* SharingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6D32DAE52B500AB2EDD /* SharingTest.swift */; };
96+
B5E2E6D72DAE571200AB2EDD /* PasswordInputField.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6D62DAE571200AB2EDD /* PasswordInputField.xib */; };
97+
B5E2E6D82DAE571200AB2EDD /* PasswordInputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6D52DAE571200AB2EDD /* PasswordInputField.swift */; };
98+
B5E2E6DD2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6DC2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib */; };
99+
B5E2E6DE2DAE573B00AB2EDD /* NCFilePermissionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6DA2DAE573B00AB2EDD /* NCFilePermissionCell.xib */; };
100+
B5E2E6DF2DAE573B00AB2EDD /* NCFilePermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6D92DAE573B00AB2EDD /* NCFilePermissionCell.swift */; };
101+
B5E2E6E02DAE573B00AB2EDD /* NCFilePermissionEditCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6DB2DAE573B00AB2EDD /* NCFilePermissionEditCell.swift */; };
102+
B5E2E6E22DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6E12DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib */; };
103+
B5E2E6E72DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6E42DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib */; };
104+
B5E2E6E82DAE59F000AB2EDD /* NCShareTextInputCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6E62DAE59F000AB2EDD /* NCShareTextInputCell.xib */; };
105+
B5E2E6E92DAE59F000AB2EDD /* NCShareTextInputCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6E52DAE59F000AB2EDD /* NCShareTextInputCell.swift */; };
106+
B5E2E6EA2DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6E32DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift */; };
107+
B5E2E6ED2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E2E6EC2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib */; };
108+
B5E2E6EE2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6EB2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift */; };
109+
B5E2E6F02DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E2E6EF2DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift */; };
110+
C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
95111
D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
96112
D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
97113
F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
@@ -1334,7 +1350,22 @@
13341350
AFCE353227E4ED1900FEA6C2 /* UIToolbar+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIToolbar+Extension.swift"; sourceTree = "<group>"; };
13351351
AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
13361352
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
1337-
AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
1353+
AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
1354+
B5E2E6D32DAE52B500AB2EDD /* SharingTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingTest.swift; sourceTree = "<group>"; };
1355+
B5E2E6D52DAE571200AB2EDD /* PasswordInputField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordInputField.swift; sourceTree = "<group>"; };
1356+
B5E2E6D62DAE571200AB2EDD /* PasswordInputField.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PasswordInputField.xib; sourceTree = "<group>"; };
1357+
B5E2E6D92DAE573B00AB2EDD /* NCFilePermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCFilePermissionCell.swift; sourceTree = "<group>"; };
1358+
B5E2E6DA2DAE573B00AB2EDD /* NCFilePermissionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCFilePermissionCell.xib; sourceTree = "<group>"; };
1359+
B5E2E6DB2DAE573B00AB2EDD /* NCFilePermissionEditCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCFilePermissionEditCell.swift; sourceTree = "<group>"; };
1360+
B5E2E6DC2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCFilePermissionEditCell.xib; sourceTree = "<group>"; };
1361+
B5E2E6E12DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareAdvancePermissionHeader.xib; sourceTree = "<group>"; };
1362+
B5E2E6E32DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareHeaderCustomCell.swift; sourceTree = "<group>"; };
1363+
B5E2E6E42DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareHeaderCustomCell.xib; sourceTree = "<group>"; };
1364+
B5E2E6E52DAE59F000AB2EDD /* NCShareTextInputCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareTextInputCell.swift; sourceTree = "<group>"; };
1365+
B5E2E6E62DAE59F000AB2EDD /* NCShareTextInputCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareTextInputCell.xib; sourceTree = "<group>"; };
1366+
B5E2E6EB2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareEmailFieldCell.swift; sourceTree = "<group>"; };
1367+
B5E2E6EC2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareEmailFieldCell.xib; sourceTree = "<group>"; };
1368+
B5E2E6EF2DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareDownloadLimitNetwork.swift; sourceTree = "<group>"; };
13381369
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13391370
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13401371
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
@@ -2123,6 +2154,8 @@
21232154
isa = PBXGroup;
21242155
children = (
21252156
AA52EB452D42AC5A0089C348 /* Placeholder.swift */,
2157+
B5E2E6D32DAE52B500AB2EDD /* SharingTest.swift */,
2158+
AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */,
21262159
);
21272160
path = NextcloudUnitTests;
21282161
sourceTree = "<group>";
@@ -2150,6 +2183,15 @@
21502183
isa = PBXGroup;
21512184
children = (
21522185
AA8D316D2D4123B200FE2775 /* DownloadLimit */,
2186+
B5E2E6E32DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift */,
2187+
B5E2E6E42DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib */,
2188+
B5E2E6E52DAE59F000AB2EDD /* NCShareTextInputCell.swift */,
2189+
B5E2E6E62DAE59F000AB2EDD /* NCShareTextInputCell.xib */,
2190+
B5E2E6E12DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib */,
2191+
B5E2E6D92DAE573B00AB2EDD /* NCFilePermissionCell.swift */,
2192+
B5E2E6DA2DAE573B00AB2EDD /* NCFilePermissionCell.xib */,
2193+
B5E2E6DB2DAE573B00AB2EDD /* NCFilePermissionEditCell.swift */,
2194+
B5E2E6DC2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib */,
21532195
AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */,
21542196
AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */,
21552197
AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */,
@@ -2382,6 +2424,9 @@
23822424
F728CE741BF6322C00E69702 /* Share */ = {
23832425
isa = PBXGroup;
23842426
children = (
2427+
B5E2E6EF2DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift */,
2428+
B5E2E6EB2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift */,
2429+
B5E2E6EC2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib */,
23852430
AF93471327E235EB002537EE /* Advanced */,
23862431
F724377A2C10B83E00C7C68D /* NCPermissions.swift */,
23872432
F700510022DF63AC003A3356 /* NCShare.storyboard */,
@@ -2507,6 +2552,8 @@
25072552
F758B41E212C516300515F55 /* Scan document */ = {
25082553
isa = PBXGroup;
25092554
children = (
2555+
B5E2E6D52DAE571200AB2EDD /* PasswordInputField.swift */,
2556+
B5E2E6D62DAE571200AB2EDD /* PasswordInputField.xib */,
25102557
F758B457212C564000515F55 /* NCScan.storyboard */,
25112558
F758B45D212C569C00515F55 /* NCScanCell.swift */,
25122559
F758B45F212C56A400515F55 /* NCScan.swift */,
@@ -3980,9 +4027,14 @@
39804027
F758B45A212C564000515F55 /* NCScan.storyboard in Resources */,
39814028
F765F73225237E3F00391DBE /* NCRecent.storyboard in Resources */,
39824029
F78F74342163757000C2ADAD /* NCTrash.storyboard in Resources */,
4030+
B5E2E6E72DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib in Resources */,
4031+
B5E2E6E82DAE59F000AB2EDD /* NCShareTextInputCell.xib in Resources */,
39834032
F702F30225EE5D2C008F8E80 /* english.txt in Resources */,
39844033
F757CC8C29E82D0500F31428 /* NCGroupfolders.storyboard in Resources */,
39854034
F79A65C32191D90F00FF6DCC /* NCSelect.storyboard in Resources */,
4035+
B5E2E6DD2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib in Resources */,
4036+
B5E2E6ED2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib in Resources */,
4037+
B5E2E6DE2DAE573B00AB2EDD /* NCFilePermissionCell.xib in Resources */,
39864038
F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */,
39874039
AF56C1DC2784856200D8BAE2 /* NCActivityCommentView.xib in Resources */,
39884040
F7F4F10B27ECDBDB008676F9 /* Inconsolata-Light.ttf in Resources */,
@@ -4005,9 +4057,11 @@
40054057
F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */,
40064058
F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */,
40074059
AF93471927E2361E002537EE /* NCShareAdvancePermissionFooter.xib in Resources */,
4060+
B5E2E6E22DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib in Resources */,
40084061
F7725A61251F33BB00D125E0 /* NCFiles.storyboard in Resources */,
40094062
F7CBC1232BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */,
40104063
F700510122DF63AC003A3356 /* NCShare.storyboard in Resources */,
4064+
B5E2E6D72DAE571200AB2EDD /* PasswordInputField.xib in Resources */,
40114065
F787704F22E7019900F287A9 /* NCShareLinkCell.xib in Resources */,
40124066
F70753F72542A9C000972D44 /* NCViewerMediaPage.storyboard in Resources */,
40134067
F7F4F10627ECDBDB008676F9 /* Inconsolata-Medium.ttf in Resources */,
@@ -4150,6 +4204,7 @@
41504204
AA52EB472D42AC9E0089C348 /* Placeholder.swift in Sources */,
41514205
F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */,
41524206
F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */,
4207+
B5E2E6D42DAE52B500AB2EDD /* SharingTest.swift in Sources */,
41534208
F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */,
41544209
);
41554210
runOnlyForDeploymentPostprocessing = 0;
@@ -4574,13 +4629,16 @@
45744629
370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */,
45754630
F32FADA92D1176E3007035E2 /* UIButton+Extension.swift in Sources */,
45764631
F768822C2C0DD1E7001CF441 /* NCKeychain.swift in Sources */,
4632+
B5E2E6EE2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift in Sources */,
45774633
F7BFFD282C8846020029A201 /* NCHud.swift in Sources */,
45784634
F71CD6CA2930D7B1006C95C1 /* NCApplicationHandle.swift in Sources */,
45794635
F3754A7D2CF87D600009312E /* SetupPasscodeView.swift in Sources */,
45804636
F73EF7D72B0226080087E6E9 /* NCManageDatabase+Tip.swift in Sources */,
45814637
F3374A842D64AC31002A38F9 /* AssistantLabelStyle.swift in Sources */,
45824638
F74BAE172C7E2F4E0028D4FA /* FileProviderDomain.swift in Sources */,
45834639
F76882402C0DD30B001CF441 /* ViewOnAppear.swift in Sources */,
4640+
B5E2E6E92DAE59F000AB2EDD /* NCShareTextInputCell.swift in Sources */,
4641+
B5E2E6EA2DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift in Sources */,
45844642
F790110E21415BF600D7B136 /* NCViewerRichDocument.swift in Sources */,
45854643
F78ACD4021903CC20088454D /* NCGridCell.swift in Sources */,
45864644
F7D890752BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift in Sources */,
@@ -4719,6 +4777,7 @@
47194777
F73EF7BF2B02250B0087E6E9 /* NCManageDatabase+GPS.swift in Sources */,
47204778
F39A1EE22D0AF8A400DAD522 /* Albums.swift in Sources */,
47214779
F71F6D072B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */,
4780+
B5E2E6D82DAE571200AB2EDD /* PasswordInputField.swift in Sources */,
47224781
F761856C29E98543006EB3B0 /* NCIntroCollectionViewCell.swift in Sources */,
47234782
F75DD765290ABB25002EB562 /* Intent.intentdefinition in Sources */,
47244783
F7D4BF012CA1831900A5E746 /* NCCollectionViewCommonPinchGesture.swift in Sources */,
@@ -4779,6 +4838,7 @@
47794838
F702F30125EE5D2C008F8E80 /* NYMnemonic.m in Sources */,
47804839
AF93474E27E3F212002537EE /* NCShareNewUserAddComment.swift in Sources */,
47814840
F7C30DFD291BD0B80017149B /* NCNetworkingE2EEDelete.swift in Sources */,
4841+
B5E2E6F02DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift in Sources */,
47824842
F76882302C0DD1E7001CF441 /* NCFileNameModel.swift in Sources */,
47834843
F72FD3B5297ED49A00075D28 /* NCManageDatabase+E2EE.swift in Sources */,
47844844
F73EF7CF2B0225BA0087E6E9 /* NCManageDatabase+Tag.swift in Sources */,
@@ -4807,6 +4867,8 @@
48074867
AF93471B27E2361E002537EE /* NCShareAdvancePermission.swift in Sources */,
48084868
F77BC3ED293E528A005F2B08 /* NCConfigServer.swift in Sources */,
48094869
F7A560422AE1593700BE8FD6 /* NCOperationSaveLivePhoto.swift in Sources */,
4870+
B5E2E6DF2DAE573B00AB2EDD /* NCFilePermissionCell.swift in Sources */,
4871+
B5E2E6E02DAE573B00AB2EDD /* NCFilePermissionEditCell.swift in Sources */,
48104872
F7D1C4AC2C9484FD00EC6D44 /* NCMedia+CollectionViewDataSourcePrefetching.swift in Sources */,
48114873
F7A03E332D426115007AA677 /* NCMoreNavigationController.swift in Sources */,
48124874
F7401C152C75E6F300649E87 /* NCCapabilities.swift in Sources */,

‎iOSClient/Activity/NCActivity.swift‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
5454
didSet { tableView.tableFooterView?.isHidden = hasActivityToLoad }
5555
}
5656
var dateAutomaticFetch: Date?
57+
private let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
5758

5859
var session: NCSession.Session {
5960
if account.isEmpty {
@@ -103,6 +104,7 @@ class NCActivity: UIViewController, NCSharePagingContent {
103104
override func viewWillAppear(_ animated: Bool) {
104105
super.viewWillAppear(animated)
105106

107+
appDelegate.activeViewController = self
106108
navigationController?.setNavigationBarAppearance()
107109
fetchAll(isInitial: true)
108110
}
@@ -131,14 +133,10 @@ class NCActivity: UIViewController, NCSharePagingContent {
131133

132134
let label = UILabel()
133135
label.font = UIFont.systemFont(ofSize: 15)
134-
label.textColor = NCBrandColor.shared.textColor2
136+
label.textColor = UIColor.systemGray
135137
label.textAlignment = .center
136138
label.text = NSLocalizedString("_no_activity_footer_", comment: "")
137139
view.addSubview(label)
138-
label.translatesAutoresizingMaskIntoConstraints = false
139-
label.topAnchor.constraint(equalTo: view.topAnchor, constant: 20).isActive = true
140-
label.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
141-
label.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
142140

143141
return view
144142
}

‎iOSClient/Main/NCActionCenter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class NCActionCenter: NSObject, UIDocumentInteractionControllerDelegate, NCSelec
300300
let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
301301
var page = page
302302

303-
NCActivityIndicator.shared.start(backgroundView: viewController.view)
303+
DispatchQueue.main.async { NCActivityIndicator.shared.start(backgroundView: viewController.view) }
304304
NCNetworking.shared.readFile(serverUrlFileName: serverUrlFileName, account: metadata.account, queue: .main) { account, metadata, error in
305305
NCActivityIndicator.shared.stop()
306306

‎iOSClient/Menu/NCShare+Menu.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import NextcloudKit
2828
extension NCShare {
2929
func toggleShareMenu(for share: tableShare, sendMail: Bool, folder: Bool, sender: Any) {
3030

31+
let capabilities = NCCapabilities.shared.getCapabilities(account: self.metadata.account)
3132
var actions = [NCMenuAction]()
3233

3334
if !folder {

‎iOSClient/Networking/NCService.swift‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,11 @@ class NCService: NSObject {
155155
}
156156

157157
private func requestServerCapabilities(account: String, controller: NCMainTabBarController?) {
158+
let session = NCSession.shared.getSession(account: account)
158159
NextcloudKit.shared.getCapabilities(account: account, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, presponseData, error in
159160
guard error == .success, let data = presponseData?.data else {
161+
NCBrandColor.shared.settingThemingColor(account: account)
162+
NCImageCache.shared.createImagesBrandCache()
160163
return
161164
}
162165

@@ -181,26 +184,13 @@ class NCService: NSObject {
181184

182185
// Theming
183186
if NCBrandColor.shared.settingThemingColor(account: account) {
187+
NCImageCache.shared.createImagesBrandCache()
184188
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeTheming, userInfo: ["account": account])
185189
}
186190

187191
// File Sharing
188192
if NCGlobal.shared.capabilityFileSharingApiEnabled {
189-
let home = self.utilityFileSystem.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
190-
NextcloudKit.shared.readShares(parameters: NKShareParameter()) { account, shares, data, error in
191-
if error == .success {
192-
NCManageDatabase.shared.deleteTableShare(account: account)
193-
if let shares = shares, !shares.isEmpty {
194-
NCManageDatabase.shared.addShare(account: account, home: home, shares: shares)
195-
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
196-
}
197-
}
198-
}
199-
}
200-
201-
// File Sharing
202-
if NCGlobal.shared.capabilityFileSharingApiEnabled {
203-
let home = self.utilityFileSystem.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
193+
let home = self.utilityFileSystem.getHomeServer(session: session)
204194
NextcloudKit.shared.readShares(parameters: NKShareParameter()) { account, shares, data, error in
205195
if error == .success {
206196
NCManageDatabase.shared.deleteTableShare(account: account)

0 commit comments

Comments
 (0)