matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Further simplify usage of integrations

Browse Source
This commit is contained in:
Travis Ralston
2019-06-18 07:55:43 -06:00
parent d5db0077ed
commit be37332bb0
3 changed files with 14 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/Stickerpicker.js
View File

@@ -68,7 +68,7 @@ export default class Stickerpicker extends React.Component {
_acquireScalarClient() {
if (this.scalarClient) return Promise.resolve(this.scalarClient);
if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
if (ScalarAuthClient.isPossible()) {
this.scalarClient = new ScalarAuthClient();
return this.scalarClient.connect().then(() => {
this.forceUpdate();
@@ -348,7 +348,7 @@ export default class Stickerpicker extends React.Component {
/**
* Launch the integrations manager on the stickers integration page
*/
async _launchManageIntegrations() {
_launchManageIntegrations() {
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
// The integrations manager will handle scalar auth for us.