Skip to content

Commit

Permalink
Merge pull request #7290 from nextcloud/bugfix/improveLogsAgainFromUs…
Browse files Browse the repository at this point in the history
…ingThem

Cleaning logs
  • Loading branch information
mgallien authored Oct 10, 2024
2 parents 578d52c + 6c5c7c2 commit ceaa125
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
6 changes: 0 additions & 6 deletions src/gui/tray/activitylistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -656,14 +656,8 @@ void ActivityListModel::removeActivityFromActivityList(int row)

void ActivityListModel::removeActivityFromActivityList(const Activity &activity)
{
qCInfo(lcActivity) << "Activity/Notification/Error successfully dismissed: " << activity._subject;
qCInfo(lcActivity) << "Trying to remove Activity/Notification/Error from view... ";

const auto index = _finalList.indexOf(activity);
if (index != -1) {
qCInfo(lcActivity) << "Activity/Notification/Error successfully removed from the list.";
qCInfo(lcActivity) << "Updating Activity/Notification/Error view.";

beginRemoveRows({}, index, index);
_finalList.removeAt(index);
endRemoveRows();
Expand Down
1 change: 0 additions & 1 deletion src/libsync/owncloudpropagator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,6 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
}
}
_state = Finished;
qCInfo(lcPropagator) << "PropagateDirectory::slotSubJobsFinished" << "emit finished" << status << _item->_file;
emit finished(status);
}

Expand Down
2 changes: 1 addition & 1 deletion src/libsync/syncengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ bool SyncEngine::handleMassDeletion()
const auto filesDeletedThresholdExceeded = deletionCounter > ConfigFile().deleteFilesThreshold();

if ((allFilesDeleted || filesDeletedThresholdExceeded) && displayDialog) {
qCInfo(lcEngine) << "All the files are going to be changed, asking the user";
qCWarning(lcEngine) << "Many files are going to be deleted, asking the user";
int side = 0; // > 0 means more deleted on the server. < 0 means more deleted on the client
for (const auto &it : qAsConst(_syncItems)) {
if (it->_instruction == CSYNC_INSTRUCTION_REMOVE) {
Expand Down

0 comments on commit ceaa125

Please sign in to comment.