mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-27 06:45:49 +03:00
parent
d58cdaeb2a
commit
020c6d6424
3 changed files with 2 additions and 17 deletions
|
@ -660,14 +660,6 @@ void Folder::setSupportsVirtualFiles(bool enabled)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Folder::newFilesAreVirtual() const
|
|
||||||
{
|
|
||||||
if (!supportsVirtualFiles())
|
|
||||||
return false;
|
|
||||||
auto pinState = _vfs->pinState(QString());
|
|
||||||
return pinState && *pinState == PinState::OnlineOnly;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Folder::setRootPinState(PinState state)
|
void Folder::setRootPinState(PinState state)
|
||||||
{
|
{
|
||||||
_vfs->setPinState(QString(), state);
|
_vfs->setPinState(QString(), state);
|
||||||
|
@ -718,9 +710,6 @@ void Folder::saveToSettings() const
|
||||||
settings->beginGroup(FolderMan::escapeAlias(_definition.alias));
|
settings->beginGroup(FolderMan::escapeAlias(_definition.alias));
|
||||||
FolderDefinition::save(*settings, _definition);
|
FolderDefinition::save(*settings, _definition);
|
||||||
|
|
||||||
// Technically redundant, just for older clients
|
|
||||||
settings->setValue(QLatin1String("usePlaceholders"), newFilesAreVirtual());
|
|
||||||
|
|
||||||
settings->sync();
|
settings->sync();
|
||||||
qCInfo(lcFolder) << "Saved folder" << _definition.alias << "to settings, status" << settings->status();
|
qCInfo(lcFolder) << "Saved folder" << _definition.alias << "to settings, status" << settings->status();
|
||||||
}
|
}
|
||||||
|
|
|
@ -279,12 +279,6 @@ public:
|
||||||
bool supportsVirtualFiles() const;
|
bool supportsVirtualFiles() const;
|
||||||
void setSupportsVirtualFiles(bool enabled);
|
void setSupportsVirtualFiles(bool enabled);
|
||||||
|
|
||||||
/** whether new remote files shall become virtual locally
|
|
||||||
*
|
|
||||||
* This happens when the root folder pin state is OnlineOnly, but can be
|
|
||||||
* overridden by explicit subfolder pin states.
|
|
||||||
*/
|
|
||||||
bool newFilesAreVirtual() const;
|
|
||||||
void setRootPinState(PinState state);
|
void setRootPinState(PinState state);
|
||||||
|
|
||||||
/** Whether user desires a switch that couldn't be executed yet, see member */
|
/** Whether user desires a switch that couldn't be executed yet, see member */
|
||||||
|
|
|
@ -297,7 +297,9 @@ void FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account,
|
||||||
// Migrate the old "usePlaceholders" setting to the root folder pin state
|
// Migrate the old "usePlaceholders" setting to the root folder pin state
|
||||||
if (settings.value(QLatin1String(versionC), 1).toInt() == 1
|
if (settings.value(QLatin1String(versionC), 1).toInt() == 1
|
||||||
&& settings.value(QLatin1String("usePlaceholders"), false).toBool()) {
|
&& settings.value(QLatin1String("usePlaceholders"), false).toBool()) {
|
||||||
|
qCInfo(lcFolderMan) << "Migrate: From usePlaceholders to PinState::OnlineOnly";
|
||||||
f->setRootPinState(PinState::OnlineOnly);
|
f->setRootPinState(PinState::OnlineOnly);
|
||||||
|
settings.remove(QStringLiteral("usePlaceholders"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Migration: Mark folders that shall be saved in a backwards-compatible way
|
// Migration: Mark folders that shall be saved in a backwards-compatible way
|
||||||
|
|
Loading…
Reference in a new issue