Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix/available-offline] Show folder contents from cache when offline #1134

Merged
merged 1 commit into from
Aug 1, 2022
Merged

[fix/available-offline] Show folder contents from cache when offline #1134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 42 additions & 26 deletions ownCloudAppShared/Client/File Lists/QueryFileListTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ public extension OCQueryState {
}
}

public extension OCCoreConnectionStatus {
var isOffline: Bool {
switch self {
case .offline, .unavailable:
return true
default:
return false
}
}
}

public protocol MultiSelectSupport {
func setupMultiselection()
func enterMultiselection()
Expand Down Expand Up @@ -296,32 +307,37 @@ open class QueryFileListTableViewController: FileListTableViewController, SortBa
self.actionContext = ActionContext(viewController: self, core: core, query: query, items: [OCItem](), location: actionsLocation)
}

switch query.state {
case .contentsFromCache, .idle, .waitingForServerReply:
if previousItemCount == 0, self.items.count == 0, query.state == .waitingForServerReply {
break
}

if query.state.isFinal {
if self.items.count == 0 {
if self.searchController?.searchBar.text != "" {
self.messageView?.message(show: true, with: UIEdgeInsets(top: sortBar?.frame.size.height ?? 0, left: 0, bottom: 0, right: 0), imageName: "icon-search", title: "No matches".localized, message: "There is no results for this search".localized)
} else {
self.messageView?.message(show: true, imageName: "folder", title: "Empty folder".localized, message: "This folder contains no files or folders.".localized)
}
} else {
self.messageView?.message(show: false)
}

self.reloadTableData()
}
case .targetRemoved:
self.messageView?.message(show: true, imageName: "folder", title: "Folder removed".localized, message: "This folder no longer exists on the server.".localized)
self.reloadTableData()

default:
self.messageView?.message(show: false)
}
switch query.state {
case .contentsFromCache, .idle, .waitingForServerReply:
let latestItemCount = self.items.count

if previousItemCount == 0, latestItemCount == 0, query.state == .waitingForServerReply {
break
}

// Refresh on:
if (previousItemCount != latestItemCount) || // - item count change
query.state.isFinal || // - query state is final (== anything but .waitingForServerReply and .started)
((query.state == .waitingForServerReply) && (core?.connectionStatus.isOffline == true)) { // - when waiting for a server reply while the connection is offline
if latestItemCount == 0 {
if self.searchController?.searchBar.text != "" {
self.messageView?.message(show: true, with: UIEdgeInsets(top: sortBar?.frame.size.height ?? 0, left: 0, bottom: 0, right: 0), imageName: "icon-search", title: "No matches".localized, message: "There is no results for this search".localized)
} else {
self.messageView?.message(show: true, imageName: "folder", title: "Empty folder".localized, message: "This folder contains no files or folders.".localized)
}
} else {
self.messageView?.message(show: false)
}

self.reloadTableData()
}
case .targetRemoved:
self.messageView?.message(show: true, imageName: "folder", title: "Folder removed".localized, message: "This folder no longer exists on the server.".localized)
self.reloadTableData()

default:
self.messageView?.message(show: false)
}
}

// MARK: - Themeable
Expand Down