Skip to content

Commit

Permalink
Support a config option to change the default device name (#20790)
Browse files Browse the repository at this point in the history
  • Loading branch information
turt2live authored Jan 28, 2022
1 parent cfa9721 commit 7078373
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ For a good example, see https://develop.element.io/config.json.
the well-known location is used instead.
1. `analyticsOwner`: The entity that analytics data is being sent to. Used in copy
when explaining to the user where data is being sent. If not set, defaults to `brand`.
1. `defaultDeviceDisplayName`: The default device display name to use for new logins
and registrations. If not set then a calculated version will be used.

Note that `index.html` also has an og:image meta tag that is set to an image
hosted on riot.im. This is the image used if links to your copy of Element
Expand Down
4 changes: 3 additions & 1 deletion src/vector/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ export async function loadApp(fragParams: {}) {
return;
}

const defaultDeviceName = config['defaultDeviceDisplayName'] ?? platform.getDefaultDeviceDisplayName();

const MatrixChat = sdk.getComponent('structures.MatrixChat');
return <MatrixChat
onNewScreen={onNewScreen}
Expand All @@ -190,7 +192,7 @@ export async function loadApp(fragParams: {}) {
enableGuest={!config.disable_guests}
onTokenLoginCompleted={onTokenLoginCompleted}
initialScreenAfterLogin={getScreenFromLocation(window.location)}
defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
defaultDeviceDisplayName={defaultDeviceName}
/>;
}

Expand Down

0 comments on commit 7078373

Please sign in to comment.