Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Live location share - handle insufficient permissions in location sharing (PSG-610) #9047

Merged
merged 2 commits into from
Jul 13, 2022
Merged

Live location share - handle insufficient permissions in location sharing (PSG-610) #9047

merged 2 commits into from
Jul 13, 2022

Conversation

kerryarchibald
Copy link
Contributor

@kerryarchibald kerryarchibald commented Jul 12, 2022 •
edited by github-actions bot
Loading

Screenshot 2022-07-12 at 13 24 03

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Notes: Live location share - handle insufficient permissions in location sharing

Here's what your changelog entry will look like:

✨ Features

  • Live location share - handle insufficient permissions in location sharing (#9047). Contributed by @kerryarchibald.

@kerryarchibald kerryarchibald added the T-Enhancement New features, changes in functionality, performance boosts, user-facing improvements label Jul 12, 2022
@kerryarchibald kerryarchibald requested a review from a team as a code owner July 12, 2022 11:26
robintown
robintown approved these changes Jul 12, 2022
View reviewed changes
Copy link
Member

@robintown robintown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good otherwise

src/components/views/location/shareLocation.ts Outdated
Comment on lines 52 to 54
const errorMessage = shareType === LocationShareType.Live ?
"Insufficient permissions to start sharing your live location" :
"Insufficient permissions to send your location";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to our new code style ternaries should look like this:

Suggested change
const errorMessage = shareType === LocationShareType.Live ?
"Insufficient permissions to start sharing your live location" :
"Insufficient permissions to send your location";
const errorMessage = shareType === LocationShareType.Live
? "Insufficient permissions to start sharing your live location"
: "Insufficient permissions to send your location";

src/components/views/location/shareLocation.ts
Comment on lines +90 to +92
const { modalParams, errorMessage } = (error as MatrixError).errcode === 'M_FORBIDDEN' ?
getPermissionsErrorParams(shareType) :
getDefaultErrorParams(shareType, openMenu);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here with the ternary

@kerryarchibald kerryarchibald enabled auto-merge (squash) July 13, 2022 10:35
@kerryarchibald kerryarchibald merged commit bda272d into develop Jul 13, 2022
@kerryarchibald kerryarchibald deleted the psg-610/permissions-error-lls branch July 13, 2022 10:55
su-ex added a commit to SchildiChat/element-desktop that referenced this pull request Aug 22, 2022
@su-ex
Merge tag 'v1.11.2' into sc
2996b7b 
* Live location share -  focus on user location on list item click ([\#9051](matrix-org/matrix-react-sdk#9051)). Contributed by @kerryarchibald.
* Live location sharing - don't trigger unread counts for beacon location events ([\#9071](matrix-org/matrix-react-sdk#9071)). Contributed by @kerryarchibald.
* Support for sending voice messages as replies and in threads ([\#9097](matrix-org/matrix-react-sdk#9097)). Fixes element-hq/element-web#22031.
* Add `Reply in thread` button to the right-click message context-menu ([\#9004](matrix-org/matrix-react-sdk#9004)). Fixes element-hq/element-web#22745.
* Starred_Messages_Feature_Contd_II/Outreachy ([\#9086](matrix-org/matrix-react-sdk#9086)).
* Use "frequently used emojis" for autocompletion in composer ([\#8998](matrix-org/matrix-react-sdk#8998)). Fixes element-hq/element-web#18978. Contributed by @grimhilt.
* Improve clickability of view source event toggle button  ([\#9068](matrix-org/matrix-react-sdk#9068)). Fixes element-hq/element-web#21856. Contributed by @luixxiul.
* Improve clickability of "collapse" link button on bubble layout ([\#9037](matrix-org/matrix-react-sdk#9037)). Fixes element-hq/element-web#22864. Contributed by @luixxiul.
* Starred_Messages_Feature/Outreachy ([\#8842](matrix-org/matrix-react-sdk#8842)).
* Implement Use Case Selection screen ([\#8984](matrix-org/matrix-react-sdk#8984)). Contributed by @justjanne.
* Live location share - handle insufficient permissions in location sharing ([\#9047](matrix-org/matrix-react-sdk#9047)). Contributed by @kerryarchibald.
* Improve _FilePanel.scss ([\#9031](matrix-org/matrix-react-sdk#9031)). Contributed by @luixxiul.
* Improve spotlight accessibility by adding context menus ([\#8907](matrix-org/matrix-react-sdk#8907)). Fixes element-hq/element-web#20875 and element-hq/element-web#22675. Contributed by @justjanne.
* Replace mask-images with svg components in MessageActionBar ([\#9088](matrix-org/matrix-react-sdk#9088)). Fixes element-hq/element-web#22912. Contributed by @kerryarchibald.
* Unbreak in-app permalink tooltips ([\#9087](matrix-org/matrix-react-sdk#9087)). Fixes element-hq/element-web#22874.
* Show a back button when viewing a space member ([\#9095](matrix-org/matrix-react-sdk#9095)). Fixes element-hq/element-web#22898.
* Align the right edge of info tile lines with normal ones on IRC layout ([\#9058](matrix-org/matrix-react-sdk#9058)). Fixes element-hq/element-web#22871. Contributed by @luixxiul.
* Prevent email verification from overriding existing sessions ([\#9075](matrix-org/matrix-react-sdk#9075)). Fixes element-hq/element-web#22881. Contributed by @justjanne.
* Fix wrong buttons being used when exploring public rooms ([\#9062](matrix-org/matrix-react-sdk#9062)). Fixes element-hq/element-web#22862.
* Re-add padding to generic event list summary on IRC layout ([\#9063](matrix-org/matrix-react-sdk#9063)). Fixes element-hq/element-web#22869. Contributed by @luixxiul.
* Joining federated rooms via the spotlight search should no longer cause a "No known servers" error. ([\#9055](matrix-org/matrix-react-sdk#9055)). Fixes element-hq/element-web#22845. Contributed by @Half-Shot.
su-ex added a commit to SchildiChat/matrix-react-sdk that referenced this pull request Aug 22, 2022
@su-ex
Merge tag 'v3.51.0' into sc
8cb2754 
* Live location share -  focus on user location on list item click ([\matrix-org#9051](matrix-org#9051)). Contributed by @kerryarchibald.
* Live location sharing - don't trigger unread counts for beacon location events ([\matrix-org#9071](matrix-org#9071)). Contributed by @kerryarchibald.
* Support for sending voice messages as replies and in threads ([\matrix-org#9097](matrix-org#9097)). Fixes element-hq/element-web#22031.
* Add `Reply in thread` button to the right-click message context-menu ([\matrix-org#9004](matrix-org#9004)). Fixes element-hq/element-web#22745.
* Starred_Messages_Feature_Contd_II/Outreachy ([\matrix-org#9086](matrix-org#9086)).
*  Use "frequently used emojis" for autocompletion in composer ([\matrix-org#8998](matrix-org#8998)). Fixes element-hq/element-web#18978. Contributed by @grimhilt.
* Improve clickability of view source event toggle button  ([\matrix-org#9068](matrix-org#9068)). Fixes element-hq/element-web#21856. Contributed by @luixxiul.
* Improve clickability of "collapse" link button on bubble layout ([\matrix-org#9037](matrix-org#9037)). Fixes element-hq/element-web#22864. Contributed by @luixxiul.
* Starred_Messages_Feature/Outreachy ([\matrix-org#8842](matrix-org#8842)).
* Implement Use Case Selection screen ([\matrix-org#8984](matrix-org#8984)). Contributed by @justjanne.
* Live location share - handle insufficient permissions in location sharing ([\matrix-org#9047](matrix-org#9047)). Contributed by @kerryarchibald.
* Improve _FilePanel.scss ([\matrix-org#9031](matrix-org#9031)). Contributed by @luixxiul.
* Improve spotlight accessibility by adding context menus ([\matrix-org#8907](matrix-org#8907)). Fixes element-hq/element-web#20875 and element-hq/element-web#22675. Contributed by @justjanne.
* Replace mask-images with svg components in MessageActionBar ([\matrix-org#9088](matrix-org#9088)). Fixes element-hq/element-web#22912. Contributed by @kerryarchibald.
* Unbreak in-app permalink tooltips ([\matrix-org#9087](matrix-org#9087)). Fixes element-hq/element-web#22874.
* Show a back button when viewing a space member ([\matrix-org#9095](matrix-org#9095)). Fixes element-hq/element-web#22898.
* Align the right edge of info tile lines with normal ones on IRC layout ([\matrix-org#9058](matrix-org#9058)). Fixes element-hq/element-web#22871. Contributed by @luixxiul.
* Prevent email verification from overriding existing sessions ([\matrix-org#9075](matrix-org#9075)). Fixes element-hq/element-web#22881. Contributed by @justjanne.
* Fix wrong buttons being used when exploring public rooms ([\matrix-org#9062](matrix-org#9062)). Fixes element-hq/element-web#22862.
* Re-add padding to generic event list summary on IRC layout ([\matrix-org#9063](matrix-org#9063)). Fixes element-hq/element-web#22869. Contributed by @luixxiul.
* Joining federated rooms via the spotlight search should no longer cause a "No known servers" error. ([\matrix-org#9055](matrix-org#9055)). Fixes element-hq/element-web#22845. Contributed by @Half-Shot.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@robintown robintown robintown approved these changes

@dbkr dbkr Awaiting requested review from dbkr dbkr is a code owner automatically assigned from matrix-org/element-web-reviewers

@justjanne justjanne Awaiting requested review from justjanne justjanne is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Enhancement New features, changes in functionality, performance boosts, user-facing improvements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kerryarchibald @robintown