Skip to content
Snippets Groups Projects
Commit 6498dadd authored by Nicolas Vengeon's avatar Nicolas Vengeon Committed by Sébastien Blin
Browse files

locationsharing: share button visibilty bug

binding of isSharingToCurrentConversation is now also done
when the webview is loaded (it was only done on conversationChange)

GitLab: #972

Change-Id: I5b767ed3f85334f97064112d125187b7093a1e26
parent 049cb458
No related branches found
No related tags found
No related merge requests found
...@@ -219,6 +219,7 @@ Item { ...@@ -219,6 +219,7 @@ Item {
PositionManager.startPositioning() PositionManager.startPositioning()
//load locations that were received before this conversation was opened //load locations that were received before this conversation was opened
PositionManager.loadPreviousLocations(attachedAccountId); PositionManager.loadPreviousLocations(attachedAccountId);
isSharingToCurrentConversation = PositionManager.isPositionSharedToConv(attachedAccountId, currentConvId)
} }
} }
} }
...@@ -230,7 +231,6 @@ Item { ...@@ -230,7 +231,6 @@ Item {
StopSharingPositionPopup { StopSharingPositionPopup {
id: stopSharingPositionPopup id: stopSharingPositionPopup
property alias attachedAccountId: root.attachedAccountId
} }
} }
} }
......
...@@ -98,7 +98,8 @@ ColumnLayout { ...@@ -98,7 +98,8 @@ ColumnLayout {
textLeftPadding: JamiTheme.buttontextPadding textLeftPadding: JamiTheme.buttontextPadding
textRightPadding: JamiTheme.buttontextPadding textRightPadding: JamiTheme.buttontextPadding
primary: true primary: true
visible: !isSharingToCurrentConversation && !isUnpin visible: !isSharingToCurrentConversation && !isUnpin && webView.isLoaded
text: JamiStrings.shareLocation text: JamiStrings.shareLocation
color: isError color: isError
? JamiTheme.buttonTintedGreyInactive ? JamiTheme.buttonTintedGreyInactive
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment