mirror of https://github.com/vector-im/riot-web
Enable location sharing (#7703)
parent
afbc843157
commit
70a44a8cd6
|
@ -343,10 +343,7 @@ function textForMessageEvent(ev: MatrixEvent): () => string | null {
|
|||
const content = ev.getContent();
|
||||
const msgtype = content.msgtype;
|
||||
|
||||
if (
|
||||
(LOCATION_EVENT_TYPE.matches(type) || LOCATION_EVENT_TYPE.matches(msgtype)) &&
|
||||
SettingsStore.getValue("feature_location_share")
|
||||
) {
|
||||
if (LOCATION_EVENT_TYPE.matches(type) || LOCATION_EVENT_TYPE.matches(msgtype)) {
|
||||
return textForLocationEvent(ev);
|
||||
}
|
||||
|
||||
|
|
|
@ -125,19 +125,17 @@ export default class MessageEvent extends React.Component<IProps> implements IMe
|
|||
BodyType = UnknownBody;
|
||||
}
|
||||
|
||||
// TODO: this can be done in eventTypes when Polls stabilise
|
||||
// TODO: move to eventTypes when Polls spec stabilises
|
||||
if (M_POLL_START.matches(type)) {
|
||||
BodyType = sdk.getComponent('messages.MPollBody');
|
||||
}
|
||||
|
||||
// TODO: move to eventTypes when location sharing spec stabilises
|
||||
if (
|
||||
LOCATION_EVENT_TYPE.matches(type) ||
|
||||
(type === EventType.RoomMessage && msgtype === MsgType.Location)
|
||||
) {
|
||||
// TODO: tidy this up once location sharing is out of labs
|
||||
if (SettingsStore.getValue("feature_location_share")) {
|
||||
BodyType = sdk.getComponent('messages.MLocationBody');
|
||||
}
|
||||
BodyType = sdk.getComponent('messages.MLocationBody');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -87,7 +87,6 @@ interface IState {
|
|||
isMenuOpen: boolean;
|
||||
isStickerPickerOpen: boolean;
|
||||
showStickersButton: boolean;
|
||||
showLocationButton: boolean;
|
||||
}
|
||||
|
||||
@replaceableComponent("views.rooms.MessageComposer")
|
||||
|
@ -118,17 +117,11 @@ export default class MessageComposer extends React.Component<IProps, IState> {
|
|||
isMenuOpen: false,
|
||||
isStickerPickerOpen: false,
|
||||
showStickersButton: SettingsStore.getValue("MessageComposerInput.showStickersButton"),
|
||||
showLocationButton: (
|
||||
!window.electron &&
|
||||
SettingsStore.getValue("MessageComposerInput.showLocationButton")
|
||||
),
|
||||
};
|
||||
|
||||
this.instanceId = instanceCount++;
|
||||
|
||||
SettingsStore.monitorSetting("MessageComposerInput.showStickersButton", null);
|
||||
SettingsStore.monitorSetting("MessageComposerInput.showLocationButton", null);
|
||||
SettingsStore.monitorSetting("feature_location_share", null);
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -174,19 +167,6 @@ export default class MessageComposer extends React.Component<IProps, IState> {
|
|||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case "MessageComposerInput.showLocationButton":
|
||||
case "feature_location_share": {
|
||||
const showLocationButton = (
|
||||
!window.electron &&
|
||||
SettingsStore.getValue("MessageComposerInput.showLocationButton")
|
||||
);
|
||||
|
||||
if (this.state.showLocationButton !== showLocationButton) {
|
||||
this.setState({ showLocationButton });
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -463,7 +443,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
|
|||
}
|
||||
}}
|
||||
setStickerPickerOpen={this.setStickerPickerOpen}
|
||||
showLocationButton={this.state.showLocationButton}
|
||||
showLocationButton={!window.electron}
|
||||
showStickersButton={this.state.showStickersButton}
|
||||
toggleButtonMenu={this.toggleButtonMenu}
|
||||
/>
|
||||
|
|
|
@ -304,16 +304,6 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
|
|||
});
|
||||
};
|
||||
|
||||
getShowLocationIfEnabled(): string[] {
|
||||
// TODO: when location sharing is out of labs, this can be deleted and
|
||||
// we can just add this to COMPOSER_SETTINGS
|
||||
if (!window.electron && SettingsStore.getValue("feature_location_share")) {
|
||||
return ['MessageComposerInput.showLocationButton'];
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
let autoLaunchOption = null;
|
||||
if (this.state.autoLaunchSupported) {
|
||||
|
@ -395,10 +385,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
|
|||
|
||||
<div className="mx_SettingsTab_section">
|
||||
<span className="mx_SettingsTab_subheading">{ _t("Composer") }</span>
|
||||
{ this.renderGroup([
|
||||
...PreferencesUserSettingsTab.COMPOSER_SETTINGS,
|
||||
...this.getShowLocationIfEnabled(),
|
||||
]) }
|
||||
{ this.renderGroup(PreferencesUserSettingsTab.COMPOSER_SETTINGS) }
|
||||
</div>
|
||||
|
||||
<div className="mx_SettingsTab_section">
|
||||
|
|
|
@ -883,7 +883,6 @@
|
|||
"Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
|
||||
"Offline encrypted messaging using dehydrated devices": "Offline encrypted messaging using dehydrated devices",
|
||||
"Show extensible event representation of events": "Show extensible event representation of events",
|
||||
"Location sharing (under active development)": "Location sharing (under active development)",
|
||||
"Show info about bridges in room settings": "Show info about bridges in room settings",
|
||||
"Use new room breadcrumbs": "Use new room breadcrumbs",
|
||||
"New spotlight search experience": "New spotlight search experience",
|
||||
|
@ -894,7 +893,6 @@
|
|||
"Use custom size": "Use custom size",
|
||||
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
|
||||
"Show stickers button": "Show stickers button",
|
||||
"Enable location sharing": "Enable location sharing",
|
||||
"Use a more compact 'Modern' layout": "Use a more compact 'Modern' layout",
|
||||
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
|
||||
"Show join/leave messages (invites/removes/bans unaffected)": "Show join/leave messages (invites/removes/bans unaffected)",
|
||||
|
|
|
@ -305,13 +305,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
|
|||
displayName: _td("Show extensible event representation of events"),
|
||||
default: false,
|
||||
},
|
||||
"feature_location_share": {
|
||||
isFeature: true,
|
||||
labsGroup: LabGroup.Messaging,
|
||||
supportedLevels: LEVELS_FEATURE,
|
||||
displayName: _td("Location sharing (under active development)"),
|
||||
default: false,
|
||||
},
|
||||
"doNotDisturb": {
|
||||
supportedLevels: [SettingLevel.DEVICE],
|
||||
default: false,
|
||||
|
@ -394,12 +387,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
|
|||
default: true,
|
||||
controller: new UIFeatureController(UIFeature.Widgets, false),
|
||||
},
|
||||
"MessageComposerInput.showLocationButton": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td('Enable location sharing'),
|
||||
default: true,
|
||||
controller: new IncompatibleController("feature_location_share", false, false),
|
||||
},
|
||||
// TODO: Wire up appropriately to UI (FTUE notifications)
|
||||
"Notifications.alwaysShowBadgeCounts": {
|
||||
supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
|
||||
|
|
Loading…
Reference in New Issue