imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable location sharing (#7703)

Browse source
This commit is contained in:
Andy Balaam 2022-02-02 11:44:17 +00:00 • committed by GitHub
parent afbc843157
commit 70a44a8cd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
View file

@ -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">