diff --git a/src/components/views/settings/tabs/VoiceSettingsTab.js b/src/components/views/settings/tabs/VoiceSettingsTab.js
index 6e48d7f083..65f38c7841 100644
--- a/src/components/views/settings/tabs/VoiceSettingsTab.js
+++ b/src/components/views/settings/tabs/VoiceSettingsTab.js
@@ -40,7 +40,13 @@ export default class VoiceSettingsTab extends React.Component {
this._refreshMediaDevices();
}
- _refreshMediaDevices = async () => {
+ _refreshMediaDevices = async (stream) => {
+ if (stream) {
+ // kill stream so that we don't leave it lingering around with webcam enabled etc
+ // as here we called gUM to ask user for permission to their device names only
+ stream.getTracks().forEach((track) => track.stop());
+ }
+
this.setState({
mediaDevices: await CallMediaHandler.getDevices(),
activeAudioOutput: CallMediaHandler.getAudioOutput(),
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index 6f3209989e..bca68e92d3 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -17,49 +17,145 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import sdk from '../../../index';
-import { _t } from '../../../languageHandler';
+import { _t, _td } from '../../../languageHandler';
+
+function capFirst(s) {
+ return s.charAt(0).toUpperCase() + s.slice(1);
+}
export default class VerificationShowSas extends React.Component {
static propTypes = {
onDone: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired,
- sas: PropTypes.string.isRequired,
+ sas: PropTypes.object.isRequired,
}
constructor() {
super();
- this.state = {
- sasVerified: false,
- };
- }
-
- _onVerifiedStateChange = (newVal) => {
- this.setState({sasVerified: newVal});
}
render() {
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
- const HexVerify = sdk.getComponent('views.elements.HexVerify');
- return
-
{_t(
+ const EmojiText = sdk.getComponent('views.elements.EmojiText');
+
+ let sasDisplay;
+ let sasCaption;
+ if (this.props.sas.emoji) {
+ const emojiBlocks = this.props.sas.emoji.map(
+ (emoji, i) =>
+
+ {emoji[0]}
+
+
+ {_t(capFirst(emoji[1]))}
+
+
,
+ );
+ sasDisplay =
+ {emojiBlocks}
+
;
+ sasCaption = _t(
+ "Verify this user by confirming the following emoji appear on their screen.",
+ );
+ } else if (this.props.sas.decimal) {
+ const numberBlocks = this.props.sas.decimal.map((num, i) =>
+ {num}
+ );
+ sasDisplay =
+ {numberBlocks}
+
;
+ sasCaption = _t(
"Verify this user by confirming the following number appears on their screen.",
- )}
+ );
+ } else {
+ return
+ {_t("Unable to find a supported verification method.")}
+
+
;
+ }
+
+ return
+
{sasCaption}
{_t(
"For maximum security, we recommend you do this in person or use another " +
"trusted means of communication.",
)}
-
-
{_t(
- "To continue, click on each pair to confirm it's correct.",
- )}
+ {sasDisplay}
;
}
}
+
+// List of Emoji strings from the js-sdk, for i18n
+_td("Dog");
+_td("Cat");
+_td("Lion");
+_td("Horse");
+_td("Unicorn");
+_td("Pig");
+_td("Elephant");
+_td("Rabbit");
+_td("Panda");
+_td("Rooster");
+_td("Penguin");
+_td("Turtle");
+_td("Fish");
+_td("Octopus");
+_td("Butterfly");
+_td("Flower");
+_td("Tree");
+_td("Cactus");
+_td("Mushroom");
+_td("Globe");
+_td("Moon");
+_td("Cloud");
+_td("Fire");
+_td("Banana");
+_td("Apple");
+_td("Strawberry");
+_td("Corn");
+_td("Pizza");
+_td("Cake");
+_td("Heart");
+_td("Smiley");
+_td("Robot");
+_td("Hat");
+_td("Glasses");
+_td("Spanner");
+_td("Santa");
+_td("Thumbs up");
+_td("Umbrella");
+_td("Hourglass");
+_td("Clock");
+_td("Gift");
+_td("Light bulb");
+_td("Book");
+_td("Pencil");
+_td("Paperclip");
+_td("Scisors");
+_td("Padlock");
+_td("Key");
+_td("Hammer");
+_td("Telephone");
+_td("Flag");
+_td("Train");
+_td("Bicycle");
+_td("Aeroplane");
+_td("Rocket");
+_td("Trophy");
+_td("Ball");
+_td("Guitar");
+_td("Trumpet");
+_td("Bell");
+_td("Anchor");
+_td("Headphones");
+_td("Folder");
+_td("Pin");
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fb025a9e61..f48e306641 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -41,7 +41,7 @@
"Permission Required": "Permission Required",
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
"The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
- "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
+ "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
"Upload Failed": "Upload Failed",
"Failure to create room": "Failure to create room",
"Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
@@ -133,7 +133,8 @@
"Upgrades a room to a new version": "Upgrades a room to a new version",
"Changes your display nickname": "Changes your display nickname",
"Changes colour scheme of current room": "Changes colour scheme of current room",
- "Sets the room topic": "Sets the room topic",
+ "Gets or sets the room topic": "Gets or sets the room topic",
+ "This room has no topic.": "This room has no topic.",
"Sets the room name": "Sets the room name",
"Invites user with given id to current room": "Invites user with given id to current room",
"Joins room with given alias": "Joins room with given alias",
@@ -185,6 +186,12 @@
"%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
"%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
"%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
+ "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s made the room public to whoever knows the link.",
+ "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s made the room invite only.",
+ "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s changed the join rule to %(rule)s",
+ "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s has allowed guests to join the room.",
+ "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s has prevented guests from joining the room.",
+ "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s changed guest access to %(rule)s",
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
"%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
"%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
@@ -262,12 +269,9 @@
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
"Failed to join room": "Failed to join room",
"Message Pinning": "Message Pinning",
- "Tabbed settings": "Tabbed settings",
"Custom user status messages": "Custom user status messages",
- "Increase performance by only loading room members on first view": "Increase performance by only loading room members on first view",
- "Backup of encryption keys to server": "Backup of encryption keys to server",
+ "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
"Render simple counters in room header": "Render simple counters in room header",
- "Two-way device verification using short text": "Two-way device verification using short text",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
"Use compact timeline layout": "Use compact timeline layout",
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
@@ -327,17 +331,75 @@
"You've successfully verified this user.": "You've successfully verified this user.",
"Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
"Got It": "Got It",
+ "Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
"Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
+ "Unable to find a supported verification method.": "Unable to find a supported verification method.",
"For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
- "To continue, click on each pair to confirm it's correct.": "To continue, click on each pair to confirm it's correct.",
"Continue": "Continue",
- "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
- "Incorrect verification code": "Incorrect verification code",
- "Enter Code": "Enter Code",
- "Submit": "Submit",
- "Phone": "Phone",
- "Add phone number": "Add phone number",
- "Add": "Add",
+ "Dog": "Dog",
+ "Cat": "Cat",
+ "Lion": "Lion",
+ "Horse": "Horse",
+ "Unicorn": "Unicorn",
+ "Pig": "Pig",
+ "Elephant": "Elephant",
+ "Rabbit": "Rabbit",
+ "Panda": "Panda",
+ "Rooster": "Rooster",
+ "Penguin": "Penguin",
+ "Turtle": "Turtle",
+ "Fish": "Fish",
+ "Octopus": "Octopus",
+ "Butterfly": "Butterfly",
+ "Flower": "Flower",
+ "Tree": "Tree",
+ "Cactus": "Cactus",
+ "Mushroom": "Mushroom",
+ "Globe": "Globe",
+ "Moon": "Moon",
+ "Cloud": "Cloud",
+ "Fire": "Fire",
+ "Banana": "Banana",
+ "Apple": "Apple",
+ "Strawberry": "Strawberry",
+ "Corn": "Corn",
+ "Pizza": "Pizza",
+ "Cake": "Cake",
+ "Heart": "Heart",
+ "Smiley": "Smiley",
+ "Robot": "Robot",
+ "Hat": "Hat",
+ "Glasses": "Glasses",
+ "Spanner": "Spanner",
+ "Santa": "Santa",
+ "Thumbs up": "Thumbs up",
+ "Umbrella": "Umbrella",
+ "Hourglass": "Hourglass",
+ "Clock": "Clock",
+ "Gift": "Gift",
+ "Light bulb": "Light bulb",
+ "Book": "Book",
+ "Pencil": "Pencil",
+ "Paperclip": "Paperclip",
+ "Scisors": "Scisors",
+ "Padlock": "Padlock",
+ "Key": "Key",
+ "Hammer": "Hammer",
+ "Telephone": "Telephone",
+ "Flag": "Flag",
+ "Train": "Train",
+ "Bicycle": "Bicycle",
+ "Aeroplane": "Aeroplane",
+ "Rocket": "Rocket",
+ "Trophy": "Trophy",
+ "Ball": "Ball",
+ "Guitar": "Guitar",
+ "Trumpet": "Trumpet",
+ "Bell": "Bell",
+ "Anchor": "Anchor",
+ "Headphones": "Headphones",
+ "Folder": "Folder",
+ "Pin": "Pin",
"Failed to upload profile picture!": "Failed to upload profile picture!",
"Upload new:": "Upload new:",
"No display name": "No display name",
@@ -352,7 +414,7 @@
"New Password": "New Password",
"Confirm password": "Confirm password",
"Change Password": "Change Password",
- "Your home server does not support device management.": "Your home server does not support device management.",
+ "Your homeserver does not support device management.": "Your homeserver does not support device management.",
"Unable to load device list": "Unable to load device list",
"Authentication": "Authentication",
"Delete %(count)s devices|other": "Delete %(count)s devices",
@@ -371,6 +433,7 @@
"This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
"Unable to add email address": "Unable to add email address",
"Unable to verify email address.": "Unable to verify email address.",
+ "Add": "Add",
"We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.",
"Email Address": "Email Address",
"Disable Notifications": "Disable Notifications",
@@ -380,7 +443,7 @@
"Delete backup": "Delete backup",
"Unable to load key backup status": "Unable to load key backup status",
"This device is using key backup": "This device is using key backup",
- "This device is
not using key backup": "This device is
not using key backup",
+ "This device is
not using key backup. Restore the backup to start using it.": "This device is
not using key backup. Restore the backup to start using it.",
"Backing up %(sessionsRemaining)s keys...": "Backing up %(sessionsRemaining)s keys...",
"All keys backed up": "All keys backed up",
"Backup has a signature from
unknown device with ID %(deviceId)s.": "Backup has a signature from
unknown device with ID %(deviceId)s.",
@@ -389,8 +452,9 @@
"Backup has a
valid signature from
unverified device
": "Backup has a
valid signature from
unverified device
",
"Backup has an
invalid signature from
verified device
": "Backup has an
invalid signature from
verified device
",
"Backup has an
invalid signature from
unverified device
": "Backup has an
invalid signature from
unverified device
",
- "Verify...": "Verify...",
"Backup is not signed by any of your devices": "Backup is not signed by any of your devices",
+ "This backup is trusted because it has been restored on this device": "This backup is trusted because it has been restored on this device",
+ "Advanced": "Advanced",
"Backup version: ": "Backup version: ",
"Algorithm: ": "Algorithm: ",
"Restore backup": "Restore backup",
@@ -424,6 +488,8 @@
"On": "On",
"Noisy": "Noisy",
"Unable to verify phone number.": "Unable to verify phone number.",
+ "Incorrect verification code": "Incorrect verification code",
+ "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
"Verification code": "Verification code",
"Phone Number": "Phone Number",
"Profile picture": "Profile picture",
@@ -432,7 +498,6 @@
"Save": "Save",
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
"Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
- "Advanced": "Advanced",
"Room information": "Room information",
"Internal room ID:": "Internal room ID:",
"Room version": "Room version",
@@ -442,6 +507,7 @@
"Flair": "Flair",
"General": "General",
"Room Addresses": "Room Addresses",
+ "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
"URL Previews": "URL Previews",
"Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
"Success": "Success",
@@ -479,8 +545,6 @@
"Identity Server is": "Identity Server is",
"Access Token:": "Access Token:",
"click to reveal": "click to reveal",
- "Lazy loading members not supported": "Lazy loading members not supported",
- "Lazy loading is not supported by your current homeserver.": "Lazy loading is not supported by your current homeserver.",
"Labs": "Labs",
"Notifications": "Notifications",
"Start automatically after system login": "Start automatically after system login",
@@ -515,11 +579,6 @@
"To send events of type
, you must be a": "To send events of type
, you must be a",
"Roles & Permissions": "Roles & Permissions",
"Permissions": "Permissions",
- "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
- "You should not yet trust it to secure data": "You should not yet trust it to secure data",
- "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
- "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
- "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
"Click here to fix": "Click here to fix",
"To link to this room, please add an alias.": "To link to this room, please add an alias.",
@@ -571,6 +630,10 @@
" (unsupported)": " (unsupported)",
"Join as
voice or
video.": "Join as
voice or
video.",
"Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
+ "Some devices for this user are not trusted": "Some devices for this user are not trusted",
+ "Some devices in this encrypted room are not trusted": "Some devices in this encrypted room are not trusted",
+ "All devices for this user are trusted": "All devices for this user are trusted",
+ "All devices in this encrypted room are trusted": "All devices in this encrypted room are trusted",
"This event could not be displayed": "This event could not be displayed",
"%(senderName)s sent an image": "%(senderName)s sent an image",
"%(senderName)s sent a video": "%(senderName)s sent a video",
@@ -582,16 +645,10 @@
"Key request sent.": "Key request sent.",
"
Re-request encryption keys from your other devices.": "
Re-request encryption keys from your other devices.",
"Undecryptable": "Undecryptable",
- "Encrypting": "Encrypting",
- "Encrypted, not sent": "Encrypted, not sent",
- "Encrypted by a verified device": "Encrypted by a verified device",
"Encrypted by an unverified device": "Encrypted by an unverified device",
"Unencrypted message": "Unencrypted message",
"Please select the destination room for this message": "Please select the destination room for this message",
"Scroll to bottom of page": "Scroll to bottom of page",
- "Blacklisted": "Blacklisted",
- "Verified": "Verified",
- "Unverified": "Unverified",
"device id: ": "device id: ",
"Disinvite": "Disinvite",
"Kick": "Kick",
@@ -643,8 +700,6 @@
"Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
"The following files cannot be uploaded:": "The following files cannot be uploaded:",
"Upload Files": "Upload Files",
- "Encrypted room": "Encrypted room",
- "Unencrypted room": "Unencrypted room",
"Hangup": "Hangup",
"Voice call": "Voice call",
"Video call": "Video call",
@@ -691,12 +746,9 @@
"Unnamed room": "Unnamed room",
"World readable": "World readable",
"Guests can join": "Guests can join",
- "Failed to set avatar.": "Failed to set avatar.",
"(~%(count)s results)|other": "(~%(count)s results)",
"(~%(count)s results)|one": "(~%(count)s result)",
"Join Room": "Join Room",
- "Upload avatar": "Upload avatar",
- "Remove avatar": "Remove avatar",
"Settings": "Settings",
"Forget room": "Forget room",
"Search": "Search",
@@ -733,28 +785,11 @@
"You are trying to access a room.": "You are trying to access a room.",
"
Click here to join the discussion!": "
Click here to join the discussion!",
"This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled",
- "Set up": "Set up",
- "Secure Message Recovery has been set up on another device:
": "Secure Message Recovery has been set up on another device:
",
- "To view your secure message history and ensure you can view new messages on future devices, verify that device now.": "To view your secure message history and ensure you can view new messages on future devices, verify that device now.",
- "Verify device": "Verify device",
- "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.": "If you log out or use another device, you'll lose your secure message history. To prevent this, set up Secure Message Recovery.",
- "Secure Message Recovery": "Secure Message Recovery",
- "Don't ask again": "Don't ask again",
- "Privacy warning": "Privacy warning",
- "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
- "The visibility of existing history will be unchanged": "The visibility of existing history will be unchanged",
- "unknown error code": "unknown error code",
- "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
- "Enable encryption": "Enable encryption",
- "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
- "Encryption is enabled in this room": "Encryption is enabled in this room",
- "Encryption is not enabled in this room": "Encryption is not enabled in this room",
- "Favourite": "Favourite",
- "Tagged as: ": "Tagged as: ",
- "To link to a room it must have
an address.": "To link to a room it must have
an address.",
- "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
- "Internal room ID: ": "Internal room ID: ",
- "Room version number: ": "Room version number: ",
+ "Secure Key Backup should be active on all of your devices to avoid losing access to your encrypted messages.": "Secure Key Backup should be active on all of your devices to avoid losing access to your encrypted messages.",
+ "Securely back up your decryption keys to the server to make sure you'll always be able to read your encrypted messages.": "Securely back up your decryption keys to the server to make sure you'll always be able to read your encrypted messages.",
+ "Don't risk losing your encrypted messages!": "Don't risk losing your encrypted messages!",
+ "Activate Secure Key Backup": "Activate Secure Key Backup",
+ "No thanks, I'll download a copy of my decryption keys before I log out": "No thanks, I'll download a copy of my decryption keys before I log out",
"Add a topic": "Add a topic",
"This room is using an unstable room version. If you aren't expecting this, please upgrade the room.": "This room is using an unstable room version. If you aren't expecting this, please upgrade the room.",
"Click here to upgrade to the latest room version.": "Click here to upgrade to the latest room version.",
@@ -879,16 +914,17 @@
"Delete widget": "Delete widget",
"Failed to remove widget": "Failed to remove widget",
"An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
- "Revoke widget access": "Revoke widget access",
"Minimize apps": "Minimize apps",
"Reload widget": "Reload widget",
"Popout widget": "Popout widget",
"Picture": "Picture",
"Edit": "Edit",
+ "Revoke widget access": "Revoke widget access",
"Create new room": "Create new room",
"Unblacklist": "Unblacklist",
"Blacklist": "Blacklist",
"Unverify": "Unverify",
+ "Verify...": "Verify...",
"Join": "Join",
"No results": "No results",
"Delete": "Delete",
@@ -1020,6 +1056,7 @@
"Please forget all messages I have sent when my account is deactivated (
Warning: this will cause future users to see an incomplete view of conversations)": "Please forget all messages I have sent when my account is deactivated (
Warning: this will cause future users to see an incomplete view of conversations)",
"To continue, please enter your password:": "To continue, please enter your password:",
"password": "password",
+ "Verify device": "Verify device",
"Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
"Verify by comparing a short text string.": "Verify by comparing a short text string.",
"Begin Verifying": "Begin Verifying",
@@ -1065,7 +1102,6 @@
"Updating Riot": "Updating Riot",
"When you log out, you'll lose your secure message history. To prevent this, set up a recovery method.": "When you log out, you'll lose your secure message history. To prevent this, set up a recovery method.",
"Alternatively, advanced users can also manually export encryption keys in
Settings before logging out.": "Alternatively, advanced users can also manually export encryption keys in
Settings before logging out.",
- "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.": "For security, logging out will delete any end-to-end encryption keys from this browser. If you want to be able to decrypt your conversation history from future Riot sessions, please export your room keys for safe-keeping.",
"Set a Recovery Method": "Set a Recovery Method",
"I understand, log out without": "I understand, log out without",
"When signing in again, you can access encrypted chat history by restoring your key backup. You'll need your recovery passphrase or, if you didn't set a recovery passphrase, your recovery key (that you downloaded).": "When signing in again, you can access encrypted chat history by restoring your key backup. You'll need your recovery passphrase or, if you didn't set a recovery passphrase, your recovery key (that you downloaded).",
@@ -1073,7 +1109,7 @@
"To help avoid duplicate issues, please
view existing issues first (and add a +1) or
create a new issue if you can't find it.": "To help avoid duplicate issues, please
view existing issues first (and add a +1) or
create a new issue if you can't find it.",
"Report bugs & give feedback": "Report bugs & give feedback",
"Go back": "Go back",
- "Visit old settings": "Visit old settings",
+ "Room Settings": "Room Settings",
"Failed to upgrade room": "Failed to upgrade room",
"The room upgrade could not be completed": "The room upgrade could not be completed",
"Upgrade this room to version %(version)s": "Upgrade this room to version %(version)s",
@@ -1125,10 +1161,12 @@
"\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contains devices that you haven't seen before.",
"Unknown devices": "Unknown devices",
"Unable to load backup status": "Unable to load backup status",
+ "Recovery Key Mismatch": "Recovery Key Mismatch",
+ "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
+ "Incorrect Recovery Passphrase": "Incorrect Recovery Passphrase",
+ "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.",
"Unable to restore backup": "Unable to restore backup",
"No backup found!": "No backup found!",
- "Error Restoring Backup": "Error Restoring Backup",
- "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.",
"Backup Restored": "Backup Restored",
"Failed to decrypt %(failedCount)s sessions!": "Failed to decrypt %(failedCount)s sessions!",
"Restored %(sessionCount)s session keys": "Restored %(sessionCount)s session keys",
@@ -1163,11 +1201,14 @@
"Source URL": "Source URL",
"Collapse Reply Thread": "Collapse Reply Thread",
"Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
+ "unknown error code": "unknown error code",
+ "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
"All messages (noisy)": "All messages (noisy)",
"All messages": "All messages",
"Mentions only": "Mentions only",
"Leave": "Leave",
"Forget": "Forget",
+ "Favourite": "Favourite",
"Low Priority": "Low Priority",
"Direct Chat": "Direct Chat",
"Clear status": "Clear status",
@@ -1178,7 +1219,7 @@
"Login": "Login",
"powered by Matrix": "powered by Matrix",
"Robot check is currently unavailable on desktop - please use a
web browser": "Robot check is currently unavailable on desktop - please use a
web browser",
- "This Home Server would like to make sure you are not a robot": "This Home Server would like to make sure you are not a robot",
+ "This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
"Custom Server Options": "Custom Server Options",
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
@@ -1192,6 +1233,7 @@
"A text message has been sent to %(msisdn)s": "A text message has been sent to %(msisdn)s",
"Please enter the code it contains:": "Please enter the code it contains:",
"Code": "Code",
+ "Submit": "Submit",
"Start authentication": "Start authentication",
"Your Modular server": "Your Modular server",
"Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of
modular.im.": "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of
modular.im.",
@@ -1204,10 +1246,11 @@
"Username": "Username",
"Mobile phone number": "Mobile phone number",
"Not sure of your password?
Set a new one": "Not sure of your password?
Set a new one",
- "Your account": "Your account",
- "Your %(serverName)s account": "Your %(serverName)s account",
- "Sign in with": "Sign in with",
"Sign in": "Sign in",
+ "Sign in to %(serverName)s": "Sign in to %(serverName)s",
+ "Change": "Change",
+ "Sign in with": "Sign in with",
+ "Phone": "Phone",
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
"Create your account": "Create your account",
"Create your %(serverName)s account": "Create your %(serverName)s account",
@@ -1215,7 +1258,7 @@
"Email (optional)": "Email (optional)",
"Phone (optional)": "Phone (optional)",
"Confirm": "Confirm",
- "Use an email address to receover your account. Other users can invite you to rooms using your contact details.": "Use an email address to receover your account. Other users can invite you to rooms using your contact details.",
+ "Use an email address to recover your account. Other users can invite you to rooms using your contact details.": "Use an email address to recover your account. Other users can invite you to rooms using your contact details.",
"Other servers": "Other servers",
"Enter custom server URLs
What does this mean?": "Enter custom server URLs
What does this mean?",
"Homeserver URL": "Homeserver URL",
@@ -1232,6 +1275,7 @@
"
Safari and
Opera work too.": "
Safari and
Opera work too.",
"With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
"I understand the risks and wish to continue": "I understand the risks and wish to continue",
+ "Couldn't load page": "Couldn't load page",
"You must
register to use this functionality": "You must
register to use this functionality",
"You must join the room to see its files": "You must join the room to see its files",
"There are no visible files in this room": "There are no visible files in this room",
@@ -1271,13 +1315,11 @@
"Everyone": "Everyone",
"Your community hasn't got a Long Description, a HTML page to show to community members.
Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.
Click here to open settings and give it one!",
"Long Description (HTML)": "Long Description (HTML)",
+ "Upload avatar": "Upload avatar",
"Description": "Description",
"Community %(groupId)s not found": "Community %(groupId)s not found",
- "This Home server does not support communities": "This Home server does not support communities",
+ "This homeserver does not support communities": "This homeserver does not support communities",
"Failed to load %(groupId)s": "Failed to load %(groupId)s",
- "Couldn't load home page": "Couldn't load home page",
- "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
- "If you would like to create a Matrix account you can
register now.": "If you would like to create a Matrix account you can
register now.",
"Invalid configuration: Cannot supply a default homeserver URL and a default server name": "Invalid configuration: Cannot supply a default homeserver URL and a default server name",
"Failed to reject invitation": "Failed to reject invitation",
"This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
@@ -1301,8 +1343,8 @@
"Create a new community": "Create a new community",
"Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",
"You have no visible notifications": "You have no visible notifications",
- "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
- "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
+ "Failed to get protocol list from homeserver": "Failed to get protocol list from homeserver",
+ "The homeserver may be too old to support third party networks": "The homeserver may be too old to support third party networks",
"Failed to get public room list": "Failed to get public room list",
"The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
@@ -1341,7 +1383,6 @@
"No more results": "No more results",
"Unknown room %(roomId)s": "Unknown room %(roomId)s",
"Room": "Room",
- "Failed to save settings": "Failed to save settings",
"Failed to reject invite": "Failed to reject invite",
"Fill screen": "Fill screen",
"Click to unmute video": "Click to unmute video",
@@ -1357,53 +1398,31 @@
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
"Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
- "Can't load user settings": "Can't load user settings",
- "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
- "Remove Contact Information?": "Remove Contact Information?",
- "Remove %(threePid)s?": "Remove %(threePid)s?",
- "Interface Language": "Interface Language",
- "User Interface": "User Interface",
- "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
- "Key Backup": "Key Backup",
- "Ignored Users": "Ignored Users",
- "Submit Debug Logs": "Submit Debug Logs",
- "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
- "Use with caution": "Use with caution",
- "Deactivate my account": "Deactivate my account",
- "Clear Cache": "Clear Cache",
- "Updates": "Updates",
- "Bulk Options": "Bulk Options",
- "Desktop specific": "Desktop specific",
- "Missing Media Permissions, click here to request.": "Missing Media Permissions, click here to request.",
- "VoIP": "VoIP",
- "Add email address": "Add email address",
- "Display name": "Display name",
- "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
- "Logged in as:": "Logged in as:",
"Failed to send email": "Failed to send email",
"The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
"A new password must be entered.": "A new password must be entered.",
"New passwords must match each other.": "New passwords must match each other.",
"Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
- "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
- "I have verified my email address": "I have verified my email address",
- "Your password has been reset": "Your password has been reset",
- "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device",
- "Return to login screen": "Return to login screen",
- "To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
- "New password": "New password",
- "Confirm your new password": "Confirm your new password",
+ "Your account": "Your account",
+ "Your account on %(serverName)s": "Your account on %(serverName)s",
+ "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.": "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.",
+ "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.",
"Send Reset Email": "Send Reset Email",
"Sign in instead": "Sign in instead",
+ "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.",
+ "I have verified my email address": "I have verified my email address",
+ "Your password has been reset.": "Your password has been reset.",
+ "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device.",
+ "Return to login screen": "Return to login screen",
"Set a new password": "Set a new password",
"Invalid homeserver discovery response": "Invalid homeserver discovery response",
"Invalid identity server discovery response": "Invalid identity server discovery response",
"General failure": "General failure",
- "This Home Server does not support login using email address.": "This Home Server does not support login using email address.",
+ "This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
"Please
contact your service administrator to continue using this service.": "Please
contact your service administrator to continue using this service.",
"Incorrect username and/or password.": "Incorrect username and/or password.",
"Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
- "Guest access is disabled on this Home Server.": "Guest access is disabled on this Home Server.",
+ "Guest access is disabled on this homeserver.": "Guest access is disabled on this homeserver.",
"Failed to perform homeserver discovery": "Failed to perform homeserver discovery",
"The phone number entered looks invalid": "The phone number entered looks invalid",
"Unknown failure discovering homeserver": "Unknown failure discovering homeserver",
@@ -1413,12 +1432,12 @@
"Can't connect to homeserver - please check your connectivity, ensure your
homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your
homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.",
"Sign in with single sign-on": "Sign in with single sign-on",
"Try the app first": "Try the app first",
- "Sign in to your account": "Sign in to your account",
"Create account": "Create account",
"Failed to fetch avatar URL": "Failed to fetch avatar URL",
"Set a display name:": "Set a display name:",
"Upload an avatar:": "Upload an avatar:",
- "Unable to query for supported registration methods": "Unable to query for supported registration methods",
+ "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
+ "Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
"This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
"Missing password.": "Missing password.",
"Passwords don't match.": "Passwords don't match.",
@@ -1437,6 +1456,7 @@
"Users": "Users",
"unknown device": "unknown device",
"NOT verified": "NOT verified",
+ "Blacklisted": "Blacklisted",
"verified": "verified",
"Name": "Name",
"Verification": "Verification",
@@ -1502,6 +1522,8 @@
"Retry": "Retry",
"Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.",
"If you don't want to set this up now, you can later in Settings.": "If you don't want to set this up now, you can later in Settings.",
+ "Set up": "Set up",
+ "Don't ask again": "Don't ask again",
"New Recovery Method": "New Recovery Method",
"A new recovery passphrase and key for Secure Messages have been detected.": "A new recovery passphrase and key for Secure Messages have been detected.",
"If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
diff --git a/src/resizer/distributors/roomsublist2.js b/src/resizer/distributors/roomsublist2.js
index e70e6893c6..a715087630 100644
--- a/src/resizer/distributors/roomsublist2.js
+++ b/src/resizer/distributors/roomsublist2.js
@@ -319,8 +319,7 @@ class Handle {
export class Distributor extends FixedDistributor {
constructor(item, cfg) {
super(item);
- const layout = cfg.layout;
- this._handle = layout.openHandle(item.id);
+ this._handle = cfg.getLayout().openHandle(item.id);
}
finish() {
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index f21e94ea4a..9dfbc7d51e 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -21,7 +21,6 @@ import {
NotificationBodyEnabledController,
NotificationsEnabledController,
} from "./controllers/NotificationControllers";
-import LazyLoadingController from "./controllers/LazyLoadingController";
import CustomStatusController from "./controllers/CustomStatusController";
// These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
@@ -93,12 +92,6 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
- "feature_tabbed_settings": {
- isFeature: true,
- displayName: _td("Tabbed settings"),
- supportedLevels: LEVELS_FEATURE,
- default: false,
- },
"feature_custom_status": {
isFeature: true,
displayName: _td("Custom user status messages"),
@@ -106,16 +99,9 @@ export const SETTINGS = {
default: false,
controller: new CustomStatusController(),
},
- "feature_lazyloading": {
+ "feature_custom_tags": {
isFeature: true,
- displayName: _td("Increase performance by only loading room members on first view"),
- supportedLevels: LEVELS_FEATURE,
- controller: new LazyLoadingController(),
- default: true,
- },
- "feature_keybackup": {
- isFeature: true,
- displayName: _td("Backup of encryption keys to server"),
+ displayName: _td("Group & filter rooms by custom tags (refresh to apply changes)"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
@@ -125,12 +111,6 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
- "feature_sas": {
- isFeature: true,
- displayName: _td("Two-way device verification using short text"),
- supportedLevels: LEVELS_FEATURE,
- default: false,
- },
"MessageComposerInput.suggestEmoji": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Enable Emoji suggestions while typing'),
diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
new file mode 100644
index 0000000000..0f7f99aad9
--- /dev/null
+++ b/src/stores/CustomRoomTagStore.js
@@ -0,0 +1,158 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import dis from '../dispatcher';
+import * as RoomNotifs from '../RoomNotifs';
+import RoomListStore from './RoomListStore';
+import EventEmitter from 'events';
+import { throttle } from "lodash";
+import SettingsStore from "../settings/SettingsStore";
+
+const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
+
+function commonPrefix(a, b) {
+ const len = Math.min(a.length, b.length);
+ let prefix;
+ for (let i = 0; i < len; ++i) {
+ if (a.charAt(i) !== b.charAt(i)) {
+ prefix = a.substr(0, i);
+ break;
+ }
+ }
+ if (prefix === undefined) {
+ prefix = a.substr(0, len);
+ }
+ const spaceIdx = prefix.indexOf(' ');
+ if (spaceIdx !== -1) {
+ prefix = prefix.substr(0, spaceIdx + 1);
+ }
+ if (prefix.length >= 2) {
+ return prefix;
+ }
+ return "";
+}
+/**
+ * A class for storing application state for ordering tags in the TagPanel.
+ */
+class CustomRoomTagStore extends EventEmitter {
+ constructor() {
+ super();
+ // Initialise state
+ this._state = {tags: {}};
+
+ // as RoomListStore gets updated by every timeline event
+ // throttle this to only run every 500ms
+ this._getUpdatedTags = throttle(
+ this._getUpdatedTags, 500, {
+ leading: true,
+ trailing: true,
+ },
+ );
+ this._roomListStoreToken = RoomListStore.addListener(() => {
+ this._setState({tags: this._getUpdatedTags()});
+ });
+ dis.register(payload => this._onDispatch(payload));
+ }
+
+ getTags() {
+ return this._state.tags;
+ }
+
+ _setState(newState) {
+ this._state = Object.assign(this._state, newState);
+ this.emit("change");
+ }
+
+ addListener(callback) {
+ this.on("change", callback);
+ return {
+ remove: () => {
+ this.removeListener("change", callback);
+ },
+ };
+ }
+
+ getSortedTags() {
+ const roomLists = RoomListStore.getRoomLists();
+
+ const tagNames = Object.keys(this._state.tags).sort();
+ const prefixes = tagNames.map((name, i) => {
+ const isFirst = i === 0;
+ const isLast = i === tagNames.length - 1;
+ const backwardsPrefix = !isFirst ? commonPrefix(name, tagNames[i - 1]) : "";
+ const forwardsPrefix = !isLast ? commonPrefix(name, tagNames[i + 1]) : "";
+ const longestPrefix = backwardsPrefix.length > forwardsPrefix.length ?
+ backwardsPrefix : forwardsPrefix;
+ return longestPrefix;
+ });
+ return tagNames.map((name, i) => {
+ const notifs = RoomNotifs.aggregateNotificationCount(roomLists[name]);
+ let badge;
+ if (notifs.count !== 0) {
+ badge = notifs;
+ }
+ const avatarLetter = name.substr(prefixes[i].length, 1);
+ const selected = this._state.tags[name];
+ return {name, avatarLetter, badge, selected};
+ });
+ }
+
+
+ _onDispatch(payload) {
+ switch (payload.action) {
+ case 'select_custom_room_tag': {
+ const oldTags = this._state.tags;
+ if (oldTags.hasOwnProperty(payload.tag)) {
+ const tag = {};
+ tag[payload.tag] = !oldTags[payload.tag];
+ const tags = Object.assign({}, oldTags, tag);
+ this._setState({tags});
+ }
+ }
+ break;
+ case 'on_logged_out': {
+ // we assume to always have a tags object in the state
+ this._state = {tags: {}};
+ if (this._roomListStoreToken) {
+ this._roomListStoreToken.remove();
+ this._roomListStoreToken = null;
+ }
+ }
+ break;
+ }
+ }
+
+ _getUpdatedTags() {
+ if (!SettingsStore.isFeatureEnabled("feature_custom_tags")) {
+ return;
+ }
+
+ const newTagNames = Object.keys(RoomListStore.getRoomLists())
+ .filter((tagName) => {
+ return !tagName.match(STANDARD_TAGS_REGEX);
+ }).sort();
+ const prevTags = this._state && this._state.tags;
+ const newTags = newTagNames.reduce((newTags, tagName) => {
+ newTags[tagName] = (prevTags && prevTags[tagName]) || false;
+ return newTags;
+ }, {});
+ return newTags;
+ }
+}
+
+if (global.singletonCustomRoomTagStore === undefined) {
+ global.singletonCustomRoomTagStore = new CustomRoomTagStore();
+}
+export default global.singletonCustomRoomTagStore;
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 4ac1e42e2e..637e87b728 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -203,6 +203,14 @@ class GroupStore extends EventEmitter {
return this._ready[id][groupId];
}
+ getGroupIdsForRoomId(roomId) {
+ const groupIds = Object.keys(this._state[this.STATE_KEY.GroupRooms]);
+ return groupIds.filter(groupId => {
+ const rooms = this._state[this.STATE_KEY.GroupRooms][groupId] || [];
+ return rooms.some(room => room.roomId === roomId);
+ });
+ }
+
getSummary(groupId) {
return this._state[this.STATE_KEY.Summary][groupId] || {};
}
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index ed0974b0e4..d98adc5cae 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -202,6 +202,8 @@ class RoomListStore extends Store {
// If somehow we dispatched a RoomListActions.tagRoom.failure before a MatrixActions.sync
if (!this._matrixClient) return;
+ const isCustomTagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
+
this._matrixClient.getRooms().forEach((room, index) => {
const myUserId = this._matrixClient.getUserId();
const membership = room.getMyMembership();
@@ -224,9 +226,9 @@ class RoomListStore extends Store {
}
}
- // ignore tags we don't know about
+ // ignore any m. tag names we don't know about
tagNames = tagNames.filter((t) => {
- return lists[t] !== undefined;
+ return (isCustomTagsEnabled && !t.startsWith('m.')) || lists[t] !== undefined;
});
if (tagNames.length) {
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index ba78e7687f..7d425ec94c 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -20,7 +20,6 @@ import MatrixClientPeg from '../MatrixClientPeg';
import sdk from '../index';
import Modal from '../Modal';
import { _t } from '../languageHandler';
-import SettingsStore from "../settings/SettingsStore";
const INITIAL_STATE = {
// Whether we're joining the currently viewed room (see isJoining())
@@ -45,8 +44,6 @@ const INITIAL_STATE = {
forwardingEvent: null,
quotingEvent: null,
-
- isEditingSettings: false,
};
/**
@@ -119,28 +116,13 @@ class RoomViewStore extends Store {
replyingToEvent: payload.event,
});
break;
- case 'open_room_settings':
- if (SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
- const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
- Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
- roomId: this._state.roomId,
- }, 'mx_SettingsDialog');
- } else {
- this._setState({
- isEditingSettings: true,
- });
- }
- break;
- case 'open_old_room_settings':
- this._setState({
- isEditingSettings: true,
- });
- break;
- case 'close_settings':
- this._setState({
- isEditingSettings: false,
- });
+ case 'open_room_settings': {
+ const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
+ Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
+ roomId: this._state.roomId,
+ }, 'mx_SettingsDialog');
break;
+ }
}
}
@@ -339,10 +321,6 @@ class RoomViewStore extends Store {
return this._state.replyingToEvent;
}
- isEditingSettings() {
- return this._state.isEditingSettings;
- }
-
shouldPeek() {
return this._state.shouldPeek;
}
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index eef078d8da..d26394b0d4 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -15,7 +15,10 @@ limitations under the License.
*/
import {Store} from 'flux/utils';
import dis from '../dispatcher';
+import GroupStore from './GroupStore';
import Analytics from '../Analytics';
+import * as RoomNotifs from "../RoomNotifs";
+import MatrixClientPeg from '../MatrixClientPeg';
const INITIAL_STATE = {
orderedTags: null,
@@ -47,7 +50,15 @@ class TagOrderStore extends Store {
__onDispatch(payload) {
switch (payload.action) {
// Initialise state after initial sync
+ case 'view_room': {
+ const relatedGroupIds = GroupStore.getGroupIdsForRoomId(payload.room_id);
+ this._updateBadges(relatedGroupIds);
+ break;
+ }
case 'MatrixActions.sync': {
+ if (payload.state === 'SYNCING' || payload.state === 'PREPARED') {
+ this._updateBadges();
+ }
if (!(payload.prevState !== 'PREPARED' && payload.state === 'PREPARED')) {
break;
}
@@ -164,6 +175,23 @@ class TagOrderStore extends Store {
}
}
+ _updateBadges(groupIds = this._state.joinedGroupIds) {
+ if (groupIds && groupIds.length) {
+ const client = MatrixClientPeg.get();
+ const changedBadges = {};
+ groupIds.forEach(groupId => {
+ const rooms =
+ GroupStore.getGroupRooms(groupId)
+ .map(r => client.getRoom(r.roomId)) // to Room objects
+ .filter(r => r !== null && r !== undefined); // filter out rooms we haven't joined from the group
+ const badge = rooms && RoomNotifs.aggregateNotificationCount(rooms);
+ changedBadges[groupId] = (badge && badge.count !== 0) ? badge : undefined;
+ });
+ const newBadges = Object.assign({}, this._state.badges, changedBadges);
+ this._setState({badges: newBadges});
+ }
+ }
+
_updateOrderedTags() {
this._setState({
orderedTags:
@@ -190,6 +218,11 @@ class TagOrderStore extends Store {
return tagsToKeep.concat(groupIdsToAdd);
}
+ getGroupBadge(groupId) {
+ const badges = this._state.badges;
+ return badges && badges[groupId];
+ }
+
getOrderedTags() {
return this._state.orderedTags;
}
diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js
new file mode 100644
index 0000000000..ec95243a56
--- /dev/null
+++ b/test/components/structures/auth/Login-test.js
@@ -0,0 +1,90 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import expect from 'expect';
+import sinon from 'sinon';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import ReactTestUtils from 'react-dom/test-utils';
+import sdk from 'matrix-react-sdk';
+import SdkConfig from '../../../../src/SdkConfig';
+import * as TestUtils from '../../../test-utils';
+
+const Login = sdk.getComponent(
+ 'structures.auth.Login',
+);
+
+describe('Login', function() {
+ let parentDiv;
+
+ beforeEach(function() {
+ TestUtils.beforeEach(this);
+ parentDiv = document.createElement('div');
+ document.body.appendChild(parentDiv);
+ });
+
+ afterEach(function() {
+ sinon.restore();
+ ReactDOM.unmountComponentAtNode(parentDiv);
+ parentDiv.remove();
+ });
+
+ function render() {
+ return ReactDOM.render(
{}}
+ onRegisterClick={() => {}}
+ onServerConfigChange={() => {}}
+ />, parentDiv);
+ }
+
+ it('should show form with change server link', function() {
+ const root = render();
+
+ const form = ReactTestUtils.findRenderedComponentWithType(
+ root,
+ sdk.getComponent('auth.PasswordLogin'),
+ );
+ expect(form).toBeTruthy();
+
+ const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass(
+ root,
+ 'mx_AuthBody_editServerDetails',
+ );
+ expect(changeServerLink).toBeTruthy();
+ });
+
+ it('should show form without change server link when custom URLs disabled', function() {
+ sinon.stub(SdkConfig, "get").returns({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ const form = ReactTestUtils.findRenderedComponentWithType(
+ root,
+ sdk.getComponent('auth.PasswordLogin'),
+ );
+ expect(form).toBeTruthy();
+
+ const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+ root,
+ 'mx_AuthBody_editServerDetails',
+ );
+ expect(changeServerLinks).toHaveLength(0);
+ });
+});
diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js
new file mode 100644
index 0000000000..a10201d465
--- /dev/null
+++ b/test/components/structures/auth/Registration-test.js
@@ -0,0 +1,83 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import expect from 'expect';
+import sinon from 'sinon';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import ReactTestUtils from 'react-dom/test-utils';
+import sdk from 'matrix-react-sdk';
+import SdkConfig from '../../../../src/SdkConfig';
+import * as TestUtils from '../../../test-utils';
+
+const Registration = sdk.getComponent(
+ 'structures.auth.Registration',
+);
+
+describe('Registration', function() {
+ let parentDiv;
+
+ beforeEach(function() {
+ TestUtils.beforeEach(this);
+ parentDiv = document.createElement('div');
+ document.body.appendChild(parentDiv);
+ });
+
+ afterEach(function() {
+ sinon.restore();
+ ReactDOM.unmountComponentAtNode(parentDiv);
+ parentDiv.remove();
+ });
+
+ function render() {
+ return ReactDOM.render( {}}
+ onLoggedIn={() => {}}
+ onLoginClick={() => {}}
+ onServerConfigChange={() => {}}
+ />, parentDiv);
+ }
+
+ it('should show server type selector', function() {
+ const root = render();
+ const selector = ReactTestUtils.findRenderedComponentWithType(
+ root,
+ sdk.getComponent('auth.ServerTypeSelector'),
+ );
+ expect(selector).toBeTruthy();
+ });
+
+ it('should show form when custom URLs disabled', function() {
+ sinon.stub(SdkConfig, "get").returns({
+ disable_custom_urls: true,
+ });
+
+ const root = render();
+
+ // Set non-empty flows to get past the loading spinner
+ root.setState({
+ flows: [],
+ });
+
+ const form = ReactTestUtils.findRenderedComponentWithType(
+ root,
+ sdk.getComponent('auth.RegistrationForm'),
+ );
+ expect(form).toBeTruthy();
+ });
+});
`;
+ if (addAlt) {
+ const alt = (emojione.unicodeAlt) ? emojione.convert(unicode.toUpperCase()) : mappedUnicode[unicode];
+ replaceWith = `![]({require("../../../res/img/warning.svg")})
-
-