Add UIFeature.locationSharing to hide location sharing (#10727)

* Add UIFeature.locationSharing to hide location sharing * Iterate
matrix-org · Apr 28, 2023 · 457c1d0 · 457c1d0
1 parent d084c34
commit 457c1d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
@@ -60,6 +60,7 @@ import { setUpVoiceBroadcastPreRecording } from "../../../voice-broadcast/utils/
 import { SdkContextClass } from "../../../contexts/SDKContext";
 import { VoiceBroadcastInfoState } from "../../../voice-broadcast";
 import { createCantStartVoiceMessageBroadcastDialog } from "../dialogs/CantStartVoiceMessageBroadcastDialog";
+import { UIFeature } from "../../../settings/UIFeature";
 
 let instanceCount = 0;
 
@@ -614,7 +615,9 @@ export class MessageComposer extends React.Component<IProps, IState> {
                                     relation={this.props.relation}
                                     onRecordStartEndClick={this.onRecordStartEndClick}
                                     setStickerPickerOpen={this.setStickerPickerOpen}
-                                    showLocationButton={!window.electron}
+                                    showLocationButton={
+                                        !window.electron && SettingsStore.getValue(UIFeature.LocationSharing)
+                                    }
                                     showPollsButton={this.state.showPollsButton}
                                     showStickersButton={this.showStickersButton}
                                     isRichTextEnabled={this.state.isRichTextEnabled}

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -1089,6 +1089,10 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.LocationSharing]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
     [UIFeature.Voip]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,

diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
@@ -15,10 +15,11 @@ limitations under the License.
 */
 
 // see settings.md for documentation on conventions
-export enum UIFeature {
+export const enum UIFeature {
     AdvancedEncryption = "UIFeature.advancedEncryption",
     URLPreviews = "UIFeature.urlPreviews",
     Widgets = "UIFeature.widgets",
+    LocationSharing = "UIFeature.locationSharing",
     Voip = "UIFeature.voip",
     Feedback = "UIFeature.feedback",
     Registration = "UIFeature.registration",