Skip to content

Commit c1c25c3

Browse files
harshada-15-tsysharshada-15-tsys
committed
NMC 1997 - Sharing customisation changes
1 parent 9219b19 commit c1c25c3

File tree

12 files changed

+149
-85
lines changed

12 files changed

+149
-85
lines changed

‎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 */; };
@@ -1325,7 +1341,22 @@
13251341
AFCE353227E4ED1900FEA6C2 /* UIToolbar+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIToolbar+Extension.swift"; sourceTree = "<group>"; };
13261342
AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
13271343
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
1328-
AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
1344+
AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
1345+
B5E2E6D32DAE52B500AB2EDD /* SharingTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingTest.swift; sourceTree = "<group>"; };
1346+
B5E2E6D52DAE571200AB2EDD /* PasswordInputField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordInputField.swift; sourceTree = "<group>"; };
1347+
B5E2E6D62DAE571200AB2EDD /* PasswordInputField.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PasswordInputField.xib; sourceTree = "<group>"; };
1348+
B5E2E6D92DAE573B00AB2EDD /* NCFilePermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCFilePermissionCell.swift; sourceTree = "<group>"; };
1349+
B5E2E6DA2DAE573B00AB2EDD /* NCFilePermissionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCFilePermissionCell.xib; sourceTree = "<group>"; };
1350+
B5E2E6DB2DAE573B00AB2EDD /* NCFilePermissionEditCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCFilePermissionEditCell.swift; sourceTree = "<group>"; };
1351+
B5E2E6DC2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCFilePermissionEditCell.xib; sourceTree = "<group>"; };
1352+
B5E2E6E12DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareAdvancePermissionHeader.xib; sourceTree = "<group>"; };
1353+
B5E2E6E32DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareHeaderCustomCell.swift; sourceTree = "<group>"; };
1354+
B5E2E6E42DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareHeaderCustomCell.xib; sourceTree = "<group>"; };
1355+
B5E2E6E52DAE59F000AB2EDD /* NCShareTextInputCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareTextInputCell.swift; sourceTree = "<group>"; };
1356+
B5E2E6E62DAE59F000AB2EDD /* NCShareTextInputCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareTextInputCell.xib; sourceTree = "<group>"; };
1357+
B5E2E6EB2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareEmailFieldCell.swift; sourceTree = "<group>"; };
1358+
B5E2E6EC2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCShareEmailFieldCell.xib; sourceTree = "<group>"; };
1359+
B5E2E6EF2DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareDownloadLimitNetwork.swift; sourceTree = "<group>"; };
13291360
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13301361
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13311362
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
@@ -2114,6 +2145,8 @@
21142145
isa = PBXGroup;
21152146
children = (
21162147
AA52EB452D42AC5A0089C348 /* Placeholder.swift */,
2148+
B5E2E6D32DAE52B500AB2EDD /* SharingTest.swift */,
2149+
AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */,
21172150
);
21182151
path = NextcloudUnitTests;
21192152
sourceTree = "<group>";
@@ -2141,6 +2174,15 @@
21412174
isa = PBXGroup;
21422175
children = (
21432176
AA8D316D2D4123B200FE2775 /* DownloadLimit */,
2177+
B5E2E6E32DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift */,
2178+
B5E2E6E42DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib */,
2179+
B5E2E6E52DAE59F000AB2EDD /* NCShareTextInputCell.swift */,
2180+
B5E2E6E62DAE59F000AB2EDD /* NCShareTextInputCell.xib */,
2181+
B5E2E6E12DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib */,
2182+
B5E2E6D92DAE573B00AB2EDD /* NCFilePermissionCell.swift */,
2183+
B5E2E6DA2DAE573B00AB2EDD /* NCFilePermissionCell.xib */,
2184+
B5E2E6DB2DAE573B00AB2EDD /* NCFilePermissionEditCell.swift */,
2185+
B5E2E6DC2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib */,
21442186
AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */,
21452187
AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */,
21462188
AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */,
@@ -2371,6 +2413,9 @@
23712413
F728CE741BF6322C00E69702 /* Share */ = {
23722414
isa = PBXGroup;
23732415
children = (
2416+
B5E2E6EF2DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift */,
2417+
B5E2E6EB2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift */,
2418+
B5E2E6EC2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib */,
23742419
AF93471327E235EB002537EE /* Advanced */,
23752420
F724377A2C10B83E00C7C68D /* NCPermissions.swift */,
23762421
F700510022DF63AC003A3356 /* NCShare.storyboard */,
@@ -2496,6 +2541,8 @@
24962541
F758B41E212C516300515F55 /* Scan document */ = {
24972542
isa = PBXGroup;
24982543
children = (
2544+
B5E2E6D52DAE571200AB2EDD /* PasswordInputField.swift */,
2545+
B5E2E6D62DAE571200AB2EDD /* PasswordInputField.xib */,
24992546
F758B457212C564000515F55 /* NCScan.storyboard */,
25002547
F758B45D212C569C00515F55 /* NCScanCell.swift */,
25012548
F758B45F212C56A400515F55 /* NCScan.swift */,
@@ -3971,9 +4018,14 @@
39714018
F758B45A212C564000515F55 /* NCScan.storyboard in Resources */,
39724019
F765F73225237E3F00391DBE /* NCRecent.storyboard in Resources */,
39734020
F78F74342163757000C2ADAD /* NCTrash.storyboard in Resources */,
4021+
B5E2E6E72DAE59F000AB2EDD /* NCShareHeaderCustomCell.xib in Resources */,
4022+
B5E2E6E82DAE59F000AB2EDD /* NCShareTextInputCell.xib in Resources */,
39744023
F702F30225EE5D2C008F8E80 /* english.txt in Resources */,
39754024
F757CC8C29E82D0500F31428 /* NCGroupfolders.storyboard in Resources */,
39764025
F79A65C32191D90F00FF6DCC /* NCSelect.storyboard in Resources */,
4026+
B5E2E6DD2DAE573B00AB2EDD /* NCFilePermissionEditCell.xib in Resources */,
4027+
B5E2E6ED2DAE66AF00AB2EDD /* NCShareEmailFieldCell.xib in Resources */,
4028+
B5E2E6DE2DAE573B00AB2EDD /* NCFilePermissionCell.xib in Resources */,
39774029
F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */,
39784030
AF56C1DC2784856200D8BAE2 /* NCActivityCommentView.xib in Resources */,
39794031
F7F4F10B27ECDBDB008676F9 /* Inconsolata-Light.ttf in Resources */,
@@ -3996,9 +4048,11 @@
39964048
F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */,
39974049
F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */,
39984050
AF93471927E2361E002537EE /* NCShareAdvancePermissionFooter.xib in Resources */,
4051+
B5E2E6E22DAE59CD00AB2EDD /* NCShareAdvancePermissionHeader.xib in Resources */,
39994052
F7725A61251F33BB00D125E0 /* NCFiles.storyboard in Resources */,
40004053
F7CBC1232BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.xib in Resources */,
40014054
F700510122DF63AC003A3356 /* NCShare.storyboard in Resources */,
4055+
B5E2E6D72DAE571200AB2EDD /* PasswordInputField.xib in Resources */,
40024056
F787704F22E7019900F287A9 /* NCShareLinkCell.xib in Resources */,
40034057
F70753F72542A9C000972D44 /* NCViewerMediaPage.storyboard in Resources */,
40044058
F7F4F10627ECDBDB008676F9 /* Inconsolata-Medium.ttf in Resources */,
@@ -4140,6 +4194,7 @@
41404194
AA52EB472D42AC9E0089C348 /* Placeholder.swift in Sources */,
41414195
F372087D2BAB4C0F006B5430 /* TestConstants.swift in Sources */,
41424196
F78E2D6C29AF02DB0024D4F3 /* Database.swift in Sources */,
4197+
B5E2E6D42DAE52B500AB2EDD /* SharingTest.swift in Sources */,
41434198
F7817CFE29801A3500FFBC65 /* Data+Extension.swift in Sources */,
41444199
);
41454200
runOnlyForDeploymentPostprocessing = 0;
@@ -4557,13 +4612,16 @@
45574612
370D26AF248A3D7A00121797 /* NCCellProtocol.swift in Sources */,
45584613
F32FADA92D1176E3007035E2 /* UIButton+Extension.swift in Sources */,
45594614
F768822C2C0DD1E7001CF441 /* NCKeychain.swift in Sources */,
4615+
B5E2E6EE2DAE66AF00AB2EDD /* NCShareEmailFieldCell.swift in Sources */,
45604616
F7BFFD282C8846020029A201 /* NCHud.swift in Sources */,
45614617
F71CD6CA2930D7B1006C95C1 /* NCApplicationHandle.swift in Sources */,
45624618
F3754A7D2CF87D600009312E /* SetupPasscodeView.swift in Sources */,
45634619
F73EF7D72B0226080087E6E9 /* NCManageDatabase+Tip.swift in Sources */,
45644620
F3374A842D64AC31002A38F9 /* AssistantLabelStyle.swift in Sources */,
45654621
F74BAE172C7E2F4E0028D4FA /* FileProviderDomain.swift in Sources */,
45664622
F76882402C0DD30B001CF441 /* ViewOnAppear.swift in Sources */,
4623+
B5E2E6E92DAE59F000AB2EDD /* NCShareTextInputCell.swift in Sources */,
4624+
B5E2E6EA2DAE59F000AB2EDD /* NCShareHeaderCustomCell.swift in Sources */,
45674625
F790110E21415BF600D7B136 /* NCViewerRichDocument.swift in Sources */,
45684626
F78ACD4021903CC20088454D /* NCGridCell.swift in Sources */,
45694627
F7D890752BD25C570050B8A6 /* NCCollectionViewCommon+DragDrop.swift in Sources */,
@@ -4698,6 +4756,7 @@
46984756
F73EF7BF2B02250B0087E6E9 /* NCManageDatabase+GPS.swift in Sources */,
46994757
F39A1EE22D0AF8A400DAD522 /* Albums.swift in Sources */,
47004758
F71F6D072B6A6A5E00F1EB15 /* ThreadSafeArray.swift in Sources */,
4759+
B5E2E6D82DAE571200AB2EDD /* PasswordInputField.swift in Sources */,
47014760
F761856C29E98543006EB3B0 /* NCIntroCollectionViewCell.swift in Sources */,
47024761
F75DD765290ABB25002EB562 /* Intent.intentdefinition in Sources */,
47034762
F7D4BF012CA1831900A5E746 /* NCCollectionViewCommonPinchGesture.swift in Sources */,
@@ -4758,6 +4817,7 @@
47584817
F702F30125EE5D2C008F8E80 /* NYMnemonic.m in Sources */,
47594818
AF93474E27E3F212002537EE /* NCShareNewUserAddComment.swift in Sources */,
47604819
F7C30DFD291BD0B80017149B /* NCNetworkingE2EEDelete.swift in Sources */,
4820+
B5E2E6F02DAE6E3F00AB2EDD /* ShareDownloadLimitNetwork.swift in Sources */,
47614821
F76882302C0DD1E7001CF441 /* NCFileNameModel.swift in Sources */,
47624822
F72FD3B5297ED49A00075D28 /* NCManageDatabase+E2EE.swift in Sources */,
47634823
F73EF7CF2B0225BA0087E6E9 /* NCManageDatabase+Tag.swift in Sources */,
@@ -4786,6 +4846,8 @@
47864846
AF93471B27E2361E002537EE /* NCShareAdvancePermission.swift in Sources */,
47874847
F77BC3ED293E528A005F2B08 /* NCConfigServer.swift in Sources */,
47884848
F7A560422AE1593700BE8FD6 /* NCOperationSaveLivePhoto.swift in Sources */,
4849+
B5E2E6DF2DAE573B00AB2EDD /* NCFilePermissionCell.swift in Sources */,
4850+
B5E2E6E02DAE573B00AB2EDD /* NCFilePermissionEditCell.swift in Sources */,
47894851
F7D1C4AC2C9484FD00EC6D44 /* NCMedia+CollectionViewDataSourcePrefetching.swift in Sources */,
47904852
F7D368DF2DAFE19E0037E7C6 /* NCActivityNavigationController.swift in Sources */,
47914853
F7A03E332D426115007AA677 /* NCMoreNavigationController.swift in Sources */,

‎iOSClient/Activity/NCActivity.swift‎

Lines changed: 4 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,8 @@ class NCActivity: UIViewController, NCSharePagingContent {
103104
override func viewWillAppear(_ animated: Bool) {
104105
super.viewWillAppear(animated)
105106

107+
appDelegate.activeViewController = self
108+
navigationController?.setNavigationBarAppearance()
106109
fetchAll(isInitial: true)
107110
}
108111

@@ -130,14 +133,10 @@ class NCActivity: UIViewController, NCSharePagingContent {
130133

131134
let label = UILabel()
132135
label.font = UIFont.systemFont(ofSize: 15)
133-
label.textColor = NCBrandColor.shared.textColor2
136+
label.textColor = UIColor.systemGray
134137
label.textAlignment = .center
135138
label.text = NSLocalizedString("_no_activity_footer_", comment: "")
136139
view.addSubview(label)
137-
label.translatesAutoresizingMaskIntoConstraints = false
138-
label.topAnchor.constraint(equalTo: view.topAnchor, constant: 20).isActive = true
139-
label.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
140-
label.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
141140

142141
return view
143142
}

‎iOSClient/Networking/NCDownloadAction.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class NCDownloadAction: NSObject, UIDocumentInteractionControllerDelegate, NCSel
241241
let serverUrlFileName = metadata.serverUrl + "/" + metadata.fileName
242242
var page = page
243243

244-
NCActivityIndicator.shared.start(backgroundView: viewController.view)
244+
DispatchQueue.main.async { NCActivityIndicator.shared.start(backgroundView: viewController.view) }
245245
NCNetworking.shared.readFile(serverUrlFileName: serverUrlFileName, account: metadata.account, queue: .main) { account, metadata, error in
246246
NCActivityIndicator.shared.stop()
247247

‎iOSClient/Networking/NCService.swift‎

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

145145
private func requestServerCapabilities(account: String, controller: NCMainTabBarController?) {
146+
let session = NCSession.shared.getSession(account: account)
146147
NextcloudKit.shared.getCapabilities(account: account, options: NKRequestOptions(queue: NextcloudKit.shared.nkCommonInstance.backgroundQueue)) { account, presponseData, error in
147148
guard error == .success, let data = presponseData?.data else {
149+
NCBrandColor.shared.settingThemingColor(account: account)
150+
NCImageCache.shared.createImagesBrandCache()
148151
return
149152
}
150153

@@ -163,26 +166,13 @@ class NCService: NSObject {
163166

164167
// Theming
165168
if NCBrandColor.shared.settingThemingColor(account: account) {
169+
NCImageCache.shared.createImagesBrandCache()
166170
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeTheming, userInfo: ["account": account])
167171
}
168172

169173
// File Sharing
170174
if NCGlobal.shared.capabilityFileSharingApiEnabled {
171-
let home = self.utilityFileSystem.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
172-
NextcloudKit.shared.readShares(parameters: NKShareParameter()) { account, shares, data, error in
173-
if error == .success {
174-
NCManageDatabase.shared.deleteTableShare(account: account)
175-
if let shares = shares, !shares.isEmpty {
176-
NCManageDatabase.shared.addShare(account: account, home: home, shares: shares)
177-
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource)
178-
}
179-
}
180-
}
181-
}
182-
183-
// File Sharing
184-
if NCGlobal.shared.capabilityFileSharingApiEnabled {
185-
let home = self.utilityFileSystem.getHomeServer(urlBase: self.appDelegate.urlBase, userId: self.appDelegate.userId)
175+
let home = self.utilityFileSystem.getHomeServer(session: session)
186176
NextcloudKit.shared.readShares(parameters: NKShareParameter()) { account, shares, data, error in
187177
if error == .success {
188178
NCManageDatabase.shared.deleteTableShare(account: account)

0 commit comments

Comments
 (0)