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

Jump to bottom

[stable-3.9] Disable share view completely when server does not support/has disabled file sharing #5900

Merged
merged 8 commits into from
Jul 18, 2023
Merged

[stable-3.9] Disable share view completely when server does not support/has disabled file sharing #5900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb41950
Add sharingAvailable property to FileDetails class
claucambra Jul 13, 2023
9f81ae5
Set sharingAvailable property in FileDetails from Folder account capa…
claucambra Jul 13, 2023
682f4ff
Do not display sharing entry if sharing is not available on server
claucambra Jul 13, 2023
b8ce198
Do not handle setting page to sharing page if sharing not available
claucambra Jul 13, 2023
abc9be0
Fix background of tabbar in file details page
claucambra Jul 13, 2023
33474d4
Make swipeIndex properties readonly
claucambra Jul 13, 2023
5dc36c0
Compress share page tab button width and height when sharing API is d…
claucambra Jul 13, 2023
cb58ff4
Swap folder nullness assert for return
claucambra Jul 18, 2023
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
48 changes: 33 additions & 15 deletions src/gui/filedetails/FileDetailsPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,17 @@ Page {
Connections {
target: Systray
function onShowFileDetailsPage(fileLocalPath, page) {
if(fileLocalPath === root.localPath) {
if (!root.fileDetails.sharingAvailable && page == Systray.FileDetailsPage.Sharing) {
return;
}

if (fileLocalPath === root.localPath) {
switch(page) {
case Systray.FileDetailsPage.Activity:
swipeView.currentIndex = fileActivityView.swipeIndex;
break;
case Systray.FileDetailsPage.Sharing:
swipeView.currentIndex = shareView.swipeIndex;
swipeView.currentIndex = shareViewLoader.swipeIndex;
break;
}
}
Expand Down Expand Up @@ -218,6 +222,7 @@ Page {
Layout.rightMargin: root.intendedPadding

padding: 0
background: null

NCTabButton {
svgCustomColorSource: "image://svgimage-custom-color/activity.svg"
Expand All @@ -227,10 +232,13 @@ Page {
}

NCTabButton {
width: visible ? implicitWidth : 0
height: visible ? implicitHeight : 0
svgCustomColorSource: "image://svgimage-custom-color/share.svg"
text: qsTr("Sharing")
checked: swipeView.currentIndex === shareView.swipeIndex
onClicked: swipeView.currentIndex = shareView.swipeIndex
checked: swipeView.currentIndex === shareViewLoader.swipeIndex
onClicked: swipeView.currentIndex = shareViewLoader.swipeIndex
visible: root.fileDetails.sharingAvailable
}
}
}
Expand All @@ -244,7 +252,7 @@ Page {
FileActivityView {
id: fileActivityView

property int swipeIndex: SwipeView.index
readonly property int swipeIndex: SwipeView.index

delegateHorizontalPadding: root.intendedPadding

Expand All @@ -253,18 +261,28 @@ Page {
iconSize: root.iconSize
}

ShareView {
id: shareView
Loader {
id: shareViewLoader

property int swipeIndex: SwipeView.index
readonly property int swipeIndex: SwipeView.index

accountState: root.accountState
localPath: root.localPath
fileDetails: root.fileDetails
horizontalPadding: root.intendedPadding
iconSize: root.iconSize
rootStackView: root.rootStackView
backgroundsVisible: root.backgroundsVisible
width: swipeView.width
height: swipeView.height
active: root.fileDetails.sharingAvailable

sourceComponent: ShareView {
id: shareView

anchors.fill: parent

accountState: root.accountState
localPath: root.localPath
fileDetails: root.fileDetails
horizontalPadding: root.intendedPadding
iconSize: root.iconSize
rootStackView: root.rootStackView
backgroundsVisible: root.backgroundsVisible
}
}
}
}
12 changes: 12 additions & 0 deletions src/gui/filedetails/filedetails.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ void FileDetails::setLocalPath(const QString &localPath)
connect(&_fileWatcher, &QFileSystemWatcher::fileChanged, this, &FileDetails::refreshFileDetails);

const auto folder = FolderMan::instance()->folderForPath(_localPath);
if (!folder) {
qCWarning(lcFileDetails) << "No folder found for path:" << _localPath << "will not load file details.";
return;
}

const auto file = _localPath.mid(folder->cleanPath().length() + 1);

if (!folder->journalDb()->getFileRecord(file, &_fileRecord)) {
Expand All @@ -74,6 +79,8 @@ void FileDetails::setLocalPath(const QString &localPath)
updateLockExpireString();
updateFileTagModel(folder);

_sharingAvailable = folder->accountState()->account()->capabilities().shareAPI();

Q_EMIT fileChanged();
}

Expand Down Expand Up @@ -172,4 +179,9 @@ void FileDetails::updateFileTagModel(const Folder * const folder)
Q_EMIT fileTagModelChanged();
}

bool FileDetails::sharingAvailable() const
{
return _sharingAvailable;
}

} // namespace OCC
3 changes: 3 additions & 0 deletions src/gui/filedetails/filedetails.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class FileDetails : public QObject
Q_PROPERTY(QString lockExpireString READ lockExpireString NOTIFY lockExpireStringChanged)
Q_PROPERTY(bool isFolder READ isFolder NOTIFY isFolderChanged)
Q_PROPERTY(FileTagModel* fileTagModel READ fileTagModel NOTIFY fileTagModelChanged)
Q_PROPERTY(bool sharingAvailable READ sharingAvailable NOTIFY fileChanged)

public:
explicit FileDetails(QObject *parent = nullptr);
Expand All @@ -50,6 +51,7 @@ class FileDetails : public QObject
[[nodiscard]] QString lockExpireString() const;
[[nodiscard]] bool isFolder() const;
[[nodiscard]] FileTagModel *fileTagModel() const;
[[nodiscard]] bool sharingAvailable() const;

public slots:
void setLocalPath(const QString &localPath);
Expand Down Expand Up @@ -80,6 +82,7 @@ private slots:
QLocale _locale;

std::unique_ptr<FileTagModel> _fileTagModel;
bool _sharingAvailable = true;
};

} // namespace OCC