Skip to content

Commit

Permalink
Merge pull request #3773 from nextcloud/backport/3769/stable25
Browse files Browse the repository at this point in the history
  • Loading branch information
juliushaertl authored Feb 8, 2023
2 parents a9ceb40 + c348ef4 commit 0ba87db
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/services/PollingBackend.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ class PollingBackend {
return
}
this.lock = false
if (response.data.sessions.filter((session) => session.lastContact > Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME).length < 2) {
const disconnect = Date.now() - COLLABORATOR_DISCONNECT_TIME
const alive = response.data.sessions.filter((s) => s.lastContact * 1000 > disconnect)
if (alive.length < 2) {
this.maximumRefetchTimer()
} else {
this.increaseRefetchTimer()
Expand Down

0 comments on commit 0ba87db

Please sign in to comment.