Destroy devicelist if we can't fetch the devices for it.
Otherwise Converse will try to fetch the devices again and again upon page refresh.
This commit is contained in:
parent
45ed506551
commit
98fee37a41
16
dist/converse.js
vendored
16
dist/converse.js
vendored
|
@ -56981,7 +56981,19 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
|
||||||
this.devices.fetch({
|
this.devices.fetch({
|
||||||
'success': async collection => {
|
'success': async collection => {
|
||||||
if (collection.length === 0) {
|
if (collection.length === 0) {
|
||||||
const ids = await this.fetchDevicesFromServer();
|
let ids;
|
||||||
|
|
||||||
|
try {
|
||||||
|
ids = await this.fetchDevicesFromServer();
|
||||||
|
} catch (e) {
|
||||||
|
_converse.log(`Could not fetch devices for ${this.get('jid')}`);
|
||||||
|
|
||||||
|
_converse.log(e, Strophe.LogLevel.ERROR);
|
||||||
|
|
||||||
|
this.destroy();
|
||||||
|
return resolve(e);
|
||||||
|
}
|
||||||
|
|
||||||
await this.publishCurrentDevice(ids);
|
await this.publishCurrentDevice(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56990,7 +57002,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
|
||||||
'error': e => {
|
'error': e => {
|
||||||
_converse.log(e, Strophe.LogLevel.ERROR);
|
_converse.log(e, Strophe.LogLevel.ERROR);
|
||||||
|
|
||||||
resolve();
|
resolve(e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -955,14 +955,22 @@ converse.plugins.add('converse-omemo', {
|
||||||
this.devices.fetch({
|
this.devices.fetch({
|
||||||
'success': async collection => {
|
'success': async collection => {
|
||||||
if (collection.length === 0) {
|
if (collection.length === 0) {
|
||||||
const ids = await this.fetchDevicesFromServer()
|
let ids;
|
||||||
|
try {
|
||||||
|
ids = await this.fetchDevicesFromServer()
|
||||||
|
} catch (e) {
|
||||||
|
_converse.log(`Could not fetch devices for ${this.get('jid')}`);
|
||||||
|
_converse.log(e, Strophe.LogLevel.ERROR);
|
||||||
|
this.destroy();
|
||||||
|
return resolve(e);
|
||||||
|
}
|
||||||
await this.publishCurrentDevice(ids);
|
await this.publishCurrentDevice(ids);
|
||||||
}
|
}
|
||||||
resolve();
|
resolve();
|
||||||
},
|
},
|
||||||
'error': e => {
|
'error': e => {
|
||||||
_converse.log(e, Strophe.LogLevel.ERROR);
|
_converse.log(e, Strophe.LogLevel.ERROR);
|
||||||
resolve();
|
resolve(e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue
Block a user