mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Remove "history may be shared banner" (#4999)
* Revert "Do not show history visible banner when the user cannot send messages. (#4892)" This reverts commit2e09914cb7. * Revert "Add a banner to encrypted rooms with visible history. (#4851)" This reverts commit6153480d90.
This commit is contained in:
@@ -80,18 +80,7 @@ struct RoomScreenViewState: BindableState {
|
||||
(canAcceptKnocks || canDeclineKnocks || canBan)
|
||||
}
|
||||
|
||||
var identityViolationDetails: RoomScreenFooterViewDetails?
|
||||
var historyVisibleDetails: RoomScreenFooterViewDetails?
|
||||
|
||||
var footerDetails: RoomScreenFooterViewDetails? {
|
||||
if let identityViolationDetails {
|
||||
return identityViolationDetails
|
||||
}
|
||||
guard canSendMessage else {
|
||||
return nil
|
||||
}
|
||||
return historyVisibleDetails
|
||||
}
|
||||
var footerDetails: RoomScreenFooterViewDetails?
|
||||
|
||||
var bindings = RoomScreenViewStateBindings()
|
||||
}
|
||||
@@ -104,13 +93,11 @@ struct RoomScreenViewStateBindings {
|
||||
enum RoomScreenFooterViewAction {
|
||||
case resolvePinViolation(userID: String)
|
||||
case resolveVerificationViolation(userID: String)
|
||||
case dismissHistoryVisibleAlert
|
||||
}
|
||||
|
||||
enum RoomScreenFooterViewDetails {
|
||||
case pinViolation(member: RoomMemberProxyProtocol, learnMoreURL: URL)
|
||||
case verificationViolation(member: RoomMemberProxyProtocol, learnMoreURL: URL)
|
||||
case historyVisible(learnMoreURL: URL)
|
||||
}
|
||||
|
||||
enum PinnedEventsBannerState: Equatable {
|
||||
|
||||
@@ -101,9 +101,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
|
||||
Task { await resolveIdentityPinningViolation(userID) }
|
||||
case .resolveVerificationViolation(let userID):
|
||||
Task { await resolveIdentityVerificationViolation(userID) }
|
||||
case .dismissHistoryVisibleAlert:
|
||||
appSettings.acknowledgedHistoryVisibleRooms.insert(roomProxy.id)
|
||||
state.historyVisibleDetails = nil
|
||||
}
|
||||
case .acceptKnock(let eventID):
|
||||
Task { await acceptKnock(eventID: eventID) }
|
||||
@@ -247,13 +244,13 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
|
||||
}
|
||||
|
||||
if let member = identityVerificationViolations.values.first {
|
||||
state.identityViolationDetails = .verificationViolation(member: member,
|
||||
learnMoreURL: appSettings.identityPinningViolationDetailsURL)
|
||||
state.footerDetails = .verificationViolation(member: member,
|
||||
learnMoreURL: appSettings.identityPinningViolationDetailsURL)
|
||||
} else if let member = identityPinningViolations.values.first {
|
||||
state.identityViolationDetails = .pinViolation(member: member,
|
||||
learnMoreURL: appSettings.identityPinningViolationDetailsURL)
|
||||
state.footerDetails = .pinViolation(member: member,
|
||||
learnMoreURL: appSettings.identityPinningViolationDetailsURL)
|
||||
} else {
|
||||
state.identityViolationDetails = nil
|
||||
state.footerDetails = nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -345,20 +342,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
|
||||
state.canDeclineKnocks = powerLevels.canOwnUserKick()
|
||||
state.canBan = powerLevels.canOwnUserBan()
|
||||
}
|
||||
|
||||
let isHistoryVisible = roomInfo.historyVisibility == .shared || roomInfo.historyVisibility == .worldReadable
|
||||
let isHistoryVisibleBannerAcknowledged = appSettings.acknowledgedHistoryVisibleRooms.contains(roomInfo.id)
|
||||
|
||||
if appSettings.enableKeyShareOnInvite, roomInfo.isEncrypted {
|
||||
if isHistoryVisible, !isHistoryVisibleBannerAcknowledged {
|
||||
// Whenever the user opens an encrypted room with shared/world-readable history visbility, we show them a warning banner if they have not already dismissed it.
|
||||
state.historyVisibleDetails = .historyVisible(learnMoreURL: appSettings.historySharingDetailsURL)
|
||||
} else if !isHistoryVisible, isHistoryVisibleBannerAcknowledged {
|
||||
// Whenever the user opens a room with non-shared history visibility, we clear the dismiss flag to ensure that the banner is displayed again if the history is made visible in the future.
|
||||
appSettings.acknowledgedHistoryVisibleRooms.remove(roomInfo.id)
|
||||
state.historyVisibleDetails = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func setupPinnedEventsTimelineItemProviderIfNeeded() {
|
||||
|
||||
@@ -16,7 +16,7 @@ struct RoomScreenFooterView: View {
|
||||
|
||||
private var borderColor: Color {
|
||||
switch details {
|
||||
case .pinViolation, .historyVisible:
|
||||
case .pinViolation:
|
||||
.compound.borderInfoSubtle
|
||||
case .verificationViolation:
|
||||
.compound.borderCriticalSubtle
|
||||
@@ -27,7 +27,7 @@ struct RoomScreenFooterView: View {
|
||||
|
||||
private var gradient: Gradient {
|
||||
switch details {
|
||||
case .pinViolation, .historyVisible:
|
||||
case .pinViolation:
|
||||
.compound.info
|
||||
case .verificationViolation:
|
||||
Gradient(colors: [.compound.bgCriticalSubtle, .clear])
|
||||
@@ -54,8 +54,6 @@ struct RoomScreenFooterView: View {
|
||||
pinViolation(member: member, learnMoreURL: learnMoreURL)
|
||||
case .verificationViolation(member: let member, learnMoreURL: let learnMoreURL):
|
||||
verificationViolation(member: member, learnMoreURL: learnMoreURL)
|
||||
case .historyVisible(learnMoreURL: let learnMoreURL):
|
||||
historyVisibleAlert(learnMoreURL: learnMoreURL)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,43 +151,10 @@ struct RoomScreenFooterView: View {
|
||||
return description
|
||||
}
|
||||
|
||||
private func historyVisibleAlertDescriptionWithLearnMoreLink(learnMoreURL: URL) -> AttributedString {
|
||||
let linkPlaceholder = "{link}"
|
||||
var description = AttributedString(L10n.cryptoHistoryVisible(linkPlaceholder))
|
||||
var linkString = AttributedString(L10n.actionLearnMore)
|
||||
linkString.link = learnMoreURL
|
||||
linkString.bold()
|
||||
description.replace(linkPlaceholder, with: linkString)
|
||||
return description
|
||||
}
|
||||
|
||||
private func fallbackDisplayName(_ userID: String) -> String {
|
||||
guard let localpart = userID.components(separatedBy: ":").first else { return userID }
|
||||
return String(localpart.trimmingPrefix("@"))
|
||||
}
|
||||
|
||||
private func historyVisibleAlert(learnMoreURL: URL) -> some View {
|
||||
let description = historyVisibleAlertDescriptionWithLearnMoreLink(learnMoreURL: learnMoreURL)
|
||||
|
||||
return VStack(spacing: 16) {
|
||||
HStack(spacing: 16) {
|
||||
CompoundIcon(\.info).foregroundColor(.compound.iconInfoPrimary)
|
||||
Text(description)
|
||||
.font(.compound.bodyMD)
|
||||
.foregroundColor(.compound.textInfoPrimary)
|
||||
}
|
||||
Button {
|
||||
callback(.dismissHistoryVisibleAlert)
|
||||
} label: {
|
||||
Text(L10n.actionDismiss)
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
.buttonStyle(.compound(.primary, size: .medium))
|
||||
}
|
||||
.padding(.top, 16)
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.bottom, 8)
|
||||
}
|
||||
}
|
||||
|
||||
struct RoomScreenFooterView_Previews: PreviewProvider, TestablePreview {
|
||||
@@ -201,8 +166,6 @@ struct RoomScreenFooterView_Previews: PreviewProvider, TestablePreview {
|
||||
static let verificationViolationDetails: RoomScreenFooterViewDetails = .verificationViolation(member: RoomMemberProxyMock.mockBob,
|
||||
learnMoreURL: "https://element.io/")
|
||||
|
||||
static let historyVisibleDetails: RoomScreenFooterViewDetails = .historyVisible(learnMoreURL: "https://element.io")
|
||||
|
||||
static var previews: some View {
|
||||
RoomScreenFooterView(details: bobDetails, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
||||
.previewDisplayName("With displayname")
|
||||
@@ -210,7 +173,5 @@ struct RoomScreenFooterView_Previews: PreviewProvider, TestablePreview {
|
||||
.previewDisplayName("Without displayname")
|
||||
RoomScreenFooterView(details: verificationViolationDetails, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
||||
.previewDisplayName("Verification Violation")
|
||||
RoomScreenFooterView(details: historyVisibleDetails, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
|
||||
.previewDisplayName("History Visible")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user