From 5664c418c4cdf89e84e7b4500c503721294ee29c Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 29 May 2024 15:17:42 +0300 Subject: [PATCH 1/4] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 86d2d63771..c4af686bf7 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.11 -CURRENT_PROJECT_VERSION = 1.11.11 +MARKETING_VERSION = 1.11.12 +CURRENT_PROJECT_VERSION = 1.11.12 From af17fd1647ec05d6f3ca58023c9f690346d094db Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 30 May 2024 13:11:19 +0100 Subject: [PATCH 2/4] Fix a crash when the user taps play multiple times and the download fails. (#7799) --- .../Room/Attachements/MXKAttachmentsViewController.m | 8 +++++++- changelog.d/7791.bugfix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog.d/7791.bugfix diff --git a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m index 3311213417..48bcc8085a 100644 --- a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m +++ b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m @@ -107,6 +107,8 @@ The attachments array (MXAttachment instances). @property (nonatomic) BOOL customAnimationsEnabled; +@property (nonatomic) BOOL isLoadingVideo; + @end @implementation MXKAttachmentsViewController @@ -969,8 +971,10 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa navigationBarDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(hideNavigationBar) userInfo:self repeats:NO]; } } - else + else if (!self.isLoadingVideo) { + self.isLoadingVideo = YES; + MXKPieChartView *pieChartView = [[MXKPieChartView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; pieChartView.progress = 0; pieChartView.progressColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.25]; @@ -1020,6 +1024,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa [selectedCell.moviePlayer.player play]; [pieChartView removeFromSuperview]; + self.isLoadingVideo = NO; [self hideNavigationBar]; } @@ -1035,6 +1040,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa MXLogDebug(@"[MXKAttachmentsVC] video download failed"); [pieChartView removeFromSuperview]; + self.isLoadingVideo = NO; // Display the navigation bar so that the user can leave this screen self.navigationBarContainer.hidden = NO; diff --git a/changelog.d/7791.bugfix b/changelog.d/7791.bugfix new file mode 100644 index 0000000000..9bd6b87db3 --- /dev/null +++ b/changelog.d/7791.bugfix @@ -0,0 +1 @@ +Fix a crash when the user taps play multiple times and the video download fails. \ No newline at end of file From 995b3f63cb0096dffd89405f3aba0a2b2d38eadb Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 30 May 2024 13:15:25 +0100 Subject: [PATCH 3/4] version++ --- CHANGES.md | 7 +++++++ changelog.d/7791.bugfix | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/7791.bugfix diff --git a/CHANGES.md b/CHANGES.md index 5d1881ff88..bf6fc003bd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.11.12 (2024-05-30) + +🐛 Bugfixes + +- Fix a crash when the user taps play multiple times and the video download fails. ([#7791](https://github.com/element-hq/element-ios/issues/7791)) + + ## Changes in 1.11.11 (2024-05-29) No significant changes. diff --git a/changelog.d/7791.bugfix b/changelog.d/7791.bugfix deleted file mode 100644 index 9bd6b87db3..0000000000 --- a/changelog.d/7791.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a crash when the user taps play multiple times and the video download fails. \ No newline at end of file From c5cbcab44a47acce512994362835a96700393caa Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 30 May 2024 14:23:14 +0100 Subject: [PATCH 4/4] finish version++