Skip to content

Commit

Permalink
Merge pull request #9909 from vector-im/matthew/low_bandwidth
Browse files Browse the repository at this point in the history
Low bandwidth mode
  • Loading branch information
jryans committed May 31, 2019
2 parents fcf8e24 + c5461b4 commit f4192e4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ For a good example, see https://riot.im/develop/config.json.
in the `labs` section of settings. The available optional experimental features vary from
release to release. Some of the available features are described in the Labs Feature section
of this README.
1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled
or present. Useful for getting at settings which may be otherwise hidden.
1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
homeserver know what email template to use when talking to you.
1. `branding`: Configures various branding and logo details, such as:
Expand Down
1 change: 1 addition & 0 deletions config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"showLabsSettings": false,
"features": {
"feature_groups": "labs",
"feature_pinning": "labs",
Expand Down
14 changes: 6 additions & 8 deletions src/vector/platform/ElectronPlatform.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
}

// Notifications in Electron use the HTML5 notification API
const notification = new global.Notification(
title,
{
body: msg,
icon: avatarUrl,
silent: true, // we play our own sounds
},
);
const notifBody = {
body: msg,
silent: true, // we play our own sounds
};
if (avatarUrl) notifBody['icon'] = avatarUrl;
const notification = new global.Notification(title, notifBody);

notification.onclick = () => {
dis.dispatch({
Expand Down
16 changes: 7 additions & 9 deletions src/vector/platform/WebPlatform.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,13 @@ export default class WebPlatform extends VectorBasePlatform {
}

displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
const notification = new global.Notification(
title,
{
body: msg,
icon: avatarUrl,
tag: "vector",
silent: true, // we play our own sounds
},
);
const notifBody = {
body: msg,
tag: "vector",
silent: true, // we play our own sounds
};
if (avatarUrl) notifBody['icon'] = avatarUrl;
const notification = new global.Notification(title, notifBody);

notification.onclick = function() {
dis.dispatch({
Expand Down

0 comments on commit f4192e4

Please sign in to comment.