diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index c47096d02..a9dcfc73e 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,4 +1,32 @@ +Changes in BWI project 1.25.0 (2022-09-27) +=================================================== + +Upstream merge ✨: + +- v1.9.5 + +Features ✨: +- Mentions in room overview marked red +- Better handling of iOS 16 in UI + +Improvements 🙌: +- Earlier deleting of unencrypted files from rooms (#3346) +- History for new features (#3546) +- Login protection for matrix id logins (#3416) +- Preparation of analytics activation (#3608) + +Bugfix 🐛: +- Crashfix for login (Cherry pick from 1.9.6) +- Fix for secure contacts file (#3344) +- Fix icloud exclusion of contacts (#3588) + +Translations 🗣 : + +SDK API changes ⚠️: + ++Build 🧱: + Changes in BWI project 1.24.0 (2022-09-08) =================================================== diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index a58bec8d6..1b62cca78 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -28,7 +28,7 @@

- Feature-Übersicht + Features

  • Feature-Übersicht @@ -43,6 +43,7 @@

    @@ -57,33 +58,7 @@ Behobene Bugs -

    -
    • -
    -

    - Version 1.24.0 -

    - -

    - Neue Funktionen -

    -

    - -

    - Verbesserungen -

    -

    - -

    - Behobene Bugs -

    diff --git a/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsCoordinator.swift b/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsCoordinator.swift index 9a03641f7..0eb31db52 100644 --- a/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsCoordinator.swift +++ b/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsCoordinator.swift @@ -94,4 +94,6 @@ extension EnterNewRoomDetailsCoordinator: SingleImagePickerPresenterDelegate { presenter.dismiss(animated: true, completion: nil) } + func singleImagePickerPresenterDidRemoveImage(_ presenter: SingleImagePickerPresenter) { + } } diff --git a/Riot/Modules/MediaPicker/SingleImagePickerPresenter.swift b/Riot/Modules/MediaPicker/SingleImagePickerPresenter.swift index d6b88aab3..f5b6501b7 100644 --- a/Riot/Modules/MediaPicker/SingleImagePickerPresenter.swift +++ b/Riot/Modules/MediaPicker/SingleImagePickerPresenter.swift @@ -21,6 +21,7 @@ import AVFoundation @objc protocol SingleImagePickerPresenterDelegate: AnyObject { func singleImagePickerPresenter(_ presenter: SingleImagePickerPresenter, didSelectImageData imageData: Data, withUTI uti: MXKUTI?) func singleImagePickerPresenterDidCancel(_ presenter: SingleImagePickerPresenter) + func singleImagePickerPresenterDidRemoveImage(_ presenter: SingleImagePickerPresenter) } /// SingleImagePickerPresenter enables to present an image picker with single selection @@ -75,6 +76,16 @@ final class SingleImagePickerPresenter: NSObject { alert.addAction(cameraAction) alert.addAction(photoLibraryAction) + + // BWI: remove avatars + if BuildSettings.enableRemoveAvatarImage && allowsRemoveImage { + let removePhotoAction = UIAlertAction(title: BWIL10n.imagePickerActionRemovePhoto, style: .destructive, handler: { _ in + self.removeImage() + }) + + alert.addAction(removePhotoAction) + } + alert.addAction(cancelAction) if let popoverPresentationController = alert.popoverPresentationController { @@ -119,6 +130,9 @@ final class SingleImagePickerPresenter: NSObject { self.mediaPickerPresenter = mediaPickerPresenter } + private func removeImage() { + self.delegate?.singleImagePickerPresenterDidRemoveImage(self) + } } // MARK: - CameraPresenterDelegate diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index 0586e44d1..3b998dfff 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -4732,7 +4732,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate> self.imagePickerPresenter = nil; shouldRemoveAvatarImage = true; - NSLog(@"Removed avatar image"); [self updateSections]; [self.settingsDiscoveryTableViewSection reload]; diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift index 9461faaae..863b5a4ee 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift @@ -100,4 +100,7 @@ extension SpaceCreationSettingsCoordinator: SingleImagePickerPresenterDelegate { func singleImagePickerPresenterDidCancel(_ presenter: SingleImagePickerPresenter) { presenter.dismiss(animated: true, completion: nil) } + + func singleImagePickerPresenterDidRemoveImage(_ presenter: SingleImagePickerPresenter) { + } } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift index 74d88ad09..d2e451528 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift @@ -99,4 +99,7 @@ extension SpaceSettingsCoordinator: SingleImagePickerPresenterDelegate { func singleImagePickerPresenterDidCancel(_ presenter: SingleImagePickerPresenter) { presenter.dismiss(animated: true, completion: nil) } + + func singleImagePickerPresenterDidRemoveImage(_ presenter: SingleImagePickerPresenter) { + } }