Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-08-27 14:07:19 +0300
committerJoas Schilling <coding@schilljs.com>2020-08-27 14:13:41 +0300
commit77e538b1cb581de4dfcdc1668b6ae07fab61b679 (patch)
treeced66d7fa3898e29328d7089ecb5af380a916487
parent692d65b536f4e0f75a92ea0a7b2a923a88901daa (diff)
Fix permanent timeout
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--src/components/CallView/shared/LocalVideo.vue2
-rw-r--r--src/mixins/browserCheck.js2
-rw-r--r--src/mixins/talkHashCheck.js2
-rw-r--r--src/services/conversationsService.js4
-rw-r--r--src/utils/signaling.js4
-rw-r--r--src/utils/webrtc/webrtc.js6
6 files changed, 10 insertions, 10 deletions
diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue
index c790f1ba8..c6b1c8696 100644
--- a/src/components/CallView/shared/LocalVideo.vue
+++ b/src/components/CallView/shared/LocalVideo.vue
@@ -291,7 +291,7 @@ export default {
handler: function(localStreamVideoError) {
if (localStreamVideoError) {
showError(t('spreed', 'Error while accessing camera'), {
- timeout: 0,
+ timeout: -1,
})
}
},
diff --git a/src/mixins/browserCheck.js b/src/mixins/browserCheck.js
index d7af88150..d5b00d1c0 100644
--- a/src/mixins/browserCheck.js
+++ b/src/mixins/browserCheck.js
@@ -31,7 +31,7 @@ const browserCheck = {
showError(
this.unsupportedWarning,
{
- timeout: 0,
+ timeout: -1,
})
}
},
diff --git a/src/mixins/talkHashCheck.js b/src/mixins/talkHashCheck.js
index 1ce556a5f..71bde1860 100644
--- a/src/mixins/talkHashCheck.js
+++ b/src/mixins/talkHashCheck.js
@@ -51,7 +51,7 @@ const talkHashCheck = {
this.reloadWarningShown = true
showError(t('spreed', 'Nextcloud Talk was updated, please reload the page'), {
- timeout: 0,
+ timeout: -1,
})
},
},
diff --git a/src/services/conversationsService.js b/src/services/conversationsService.js
index 148b11db3..af11a70a6 100644
--- a/src/services/conversationsService.js
+++ b/src/services/conversationsService.js
@@ -46,7 +46,7 @@ const fetchConversations = async function() {
} catch (error) {
if (error.response && error.response.status === 503 && !maintenanceWarning) {
maintenanceWarning = showError(t('spreed', 'Nextcloud is in maintenance mode, please reload the page'), {
- timeout: 0,
+ timeout: -1,
})
}
throw error
@@ -72,7 +72,7 @@ const fetchConversation = async function(token) {
} catch (error) {
if (error.response && error.response.status === 503 && !maintenanceWarning) {
maintenanceWarning = showError(t('spreed', 'Nextcloud is in maintenance mode, please reload the page'), {
- timeout: 0,
+ timeout: -1,
})
}
throw error
diff --git a/src/utils/signaling.js b/src/utils/signaling.js
index 746fe7dbf..94a97266d 100644
--- a/src/utils/signaling.js
+++ b/src/utils/signaling.js
@@ -558,7 +558,7 @@ Signaling.Standalone.prototype.connect = function() {
&& this.signalingConnectionWarning === null) {
this.signalingConnectionTimeout = setTimeout(() => {
this.signalingConnectionWarning = showWarning(t('spreed', 'Establishing signaling connection is taking longer than expected …'), {
- timeout: 0,
+ timeout: -1,
})
}, 2000)
}
@@ -601,7 +601,7 @@ Signaling.Standalone.prototype.connect = function() {
}
if (this.signalingConnectionError === null) {
this.signalingConnectionError = showError(t('spreed', 'Failed to establish signaling connection. Retrying …'), {
- timeout: 0,
+ timeout: -1,
})
}
this.reconnect()
diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js
index dcd9faf33..c3535dddb 100644
--- a/src/utils/webrtc/webrtc.js
+++ b/src/utils/webrtc/webrtc.js
@@ -539,7 +539,7 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
.replace('{linkstart}', '<a target="_blank" rel="noreferrer nofollow" class="external" href="https://nextcloud-talk.readthedocs.io/en/latest/TURN/">')
.replace('{linkend}', ' ↗</a>'),
{
- timeout: 0,
+ timeout: -1,
isHTML: true,
}
)
@@ -819,7 +819,7 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
// FIXME emit an event and handle it as needed instead of
// calling UI code from here.
localStreamRequestedTimeoutNotification = showError(t('spreed', 'This is taking longer than expected. Are the media permissions already granted (or rejected)? If yes please restart your browser, as audio and video are failing'), {
- timeout: 0,
+ timeout: -1,
})
}, 10000)
})
@@ -865,7 +865,7 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
}
showError(message, {
- timeout: 0,
+ timeout: -1,
})
})