@@ -10,34 +10,41 @@ import NextcloudKit
1010
1111extension NCShareExtension : UICollectionViewDelegate {
1212 func collectionView( _ collectionView: UICollectionView , didSelectItemAt indexPath: IndexPath ) {
13- self . dataSource. getMetadata ( indexPath: indexPath) { metadata in
14- guard let metadata else { return self . showAlert ( description: " _invalid_url_ " ) }
13+ Task {
14+ guard let tblAccount = self . extensionData. getTblAccoun ( ) ,
15+ let metadata = self . dataSource. getMetadata ( indexPath: indexPath) else {
16+ return self . showAlert ( description: " _invalid_url_ " )
17+ }
1518 let serverUrl = self . utilityFileSystem. stringAppendServerUrl ( metadata. serverUrl, addFileName: metadata. fileName)
16- if metadata. e2eEncrypted && !NCKeychain( ) . isEndToEndEnabled ( account: self . session. account) {
19+
20+ if metadata. e2eEncrypted && !NCKeychain( ) . isEndToEndEnabled ( account: tblAccount. account) {
1721 self . showAlert ( title: " _info_ " , description: " _e2e_goto_settings_for_enable_ " )
1822 }
19- let capabilities = NKCapabilities . shared. getCapabilitiesBlocking ( for: self . session . account)
23+ let capabilities = NKCapabilities . shared. getCapabilitiesBlocking ( for: tblAccount . account)
2024
21- if let fileNameError = FileNameValidator . checkFileName ( metadata. fileNameView, account: self . session . account, capabilities: capabilities) {
25+ if let fileNameError = FileNameValidator . checkFileName ( metadata. fileNameView, account: tblAccount . account, capabilities: capabilities) {
2226 self . present ( UIAlertController . warning ( message: " \( fileNameError. errorDescription) \( NSLocalizedString ( " _please_rename_file_ " , comment: " " ) ) " ) , animated: true )
2327 return
2428 }
2529
2630 self . serverUrl = serverUrl
27- self . reloadDatasource ( withLoadFolder: true )
2831 self . setNavigationBar ( navigationTitle: metadata. fileNameView)
32+
33+ await self . reloadData ( )
34+ await self . loadFolder ( )
2935 }
3036 }
3137
3238 func collectionView( _ collectionView: UICollectionView , viewForSupplementaryElementOfKind kind: String , at indexPath: IndexPath ) -> UICollectionReusableView {
3339 if kind == UICollectionView . elementKindSectionHeader {
40+ let session = self . extensionData. getSession ( )
3441 guard let header = collectionView. dequeueReusableSupplementaryView ( ofKind: kind, withReuseIdentifier: " sectionFirstHeaderEmptyData " , for: indexPath) as? NCSectionFirstHeaderEmptyData else { return NCSectionFirstHeaderEmptyData ( ) }
3542 if self . dataSourceTask? . state == . running {
3643 header. emptyImage. image = utility. loadImage ( named: " wifi " , colors: [ NCBrandColor . shared. getElement ( account: session. account) ] )
3744 header. emptyTitle. text = NSLocalizedString ( " _request_in_progress_ " , comment: " " )
3845 header. emptyDescription. text = " "
3946 } else {
40- header. emptyImage. image = NCImageCache . shared. getFolder ( account: self . session. account)
47+ header. emptyImage. image = NCImageCache . shared. getFolder ( account: session. account)
4148 header. emptyTitle. text = NSLocalizedString ( " _files_no_folders_ " , comment: " " )
4249 header. emptyDescription. text = " "
4350 }
@@ -116,6 +123,8 @@ extension NCShareExtension: UICollectionViewDataSource {
116123 var isShare = false
117124 var isMounted = false
118125 let permissions = NCPermissions ( )
126+ let session = self . extensionData. getSession ( )
127+
119128 if let metadataFolder = metadataFolder {
120129 isShare = metadata. permissions. contains ( permissions. permissionShared) && !metadataFolder. permissions. contains ( permissions. permissionShared)
121130 isMounted = metadata. permissions. contains ( permissions. permissionMounted) && !metadataFolder. permissions. contains ( permissions. permissionMounted)
@@ -159,8 +168,12 @@ extension NCShareExtension: UITableViewDelegate {
159168 }
160169
161170 func tableView( _ tableView: UITableView , didSelectRowAt indexPath: IndexPath ) {
162- guard !uploadStarted else { return }
171+ guard !uploadStarted else {
172+ return
173+ }
163174 let fileName = filesName [ indexPath. row]
175+ let session = self . extensionData. getSession ( )
176+
164177 showRenameFileDialog ( named: fileName, account: session. account)
165178 }
166179}
@@ -171,10 +184,16 @@ extension NCShareExtension: UITableViewDataSource {
171184 }
172185
173186 func tableView( _ tableView: UITableView , cellForRowAt indexPath: IndexPath ) -> UITableViewCell {
174- guard let cell = tableView. dequeueReusableCell ( withIdentifier: " Cell " , for: indexPath) as? NCShareCell else { return UITableViewCell ( ) }
187+ guard let cell = tableView. dequeueReusableCell ( withIdentifier: " Cell " , for: indexPath) as? NCShareCell else {
188+ return UITableViewCell ( )
189+ }
190+
175191 let fileName = filesName [ indexPath. row]
192+ let session = self . extensionData. getSession ( )
193+
176194 cell. setup ( fileName: fileName, iconName: " " , account: session. account)
177195 cell. delegate = self
196+
178197 return cell
179198 }
180199}
0 commit comments