Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ios): fix MediaModule compile error #12187

Merged
merged 1 commit into from Oct 19, 2020
Merged

fix(ios): fix MediaModule compile error #12187

merged 1 commit into from Oct 19, 2020

Conversation

hansemannn
Copy link
Collaborator

@build build added this to the 9.3.0 milestone Oct 17, 2020
@build build requested a review from a team October 17, 2020 15:09
@build
Copy link
Contributor

build commented Oct 17, 2020

Fails
🚫

🔬 There are library changes, but no changes to the unit tests. That's OK as long as you're refactoring existing code, but will require an admin to merge this PR. Please see README.md#unit-tests for docs on unit testing.
🚫

Test suite crashed on iOS simulator. Please see the crash log for more details.
Messages
📖 🎉 Another contribution from our awesome community member, hansemannn! Thanks again for helping us make Titanium SDK better. 👍
📖 ✊ The commits in this PR match our conventions! Feel free to Rebase and Merge this PR when ready.
📖

✅ All tests are passing
Nice one! All 7506 tests are passing.
(There are 721 skipped tests not included in that total)

Generated by 🚫 dangerJS against 8898438

sgtcoolguy
sgtcoolguy suggested changes Oct 19, 2020
View reviewed changes
iphone/Classes/MediaModule.m
@@ -2016,7 +2016,7 @@ - (void)popoverPresentationControllerDidDismissPopover:(UIPopoverPresentationCon
- (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
{
#if defined(USE_TI_MEDIASHOWCAMERA) || defined(USE_TI_MEDIAOPENPHOTOGALLERY) || defined(USE_TI_MEDIASTARTVIDEOEDITING)
#if IS_SDK_IOS_14
#if IS_SDK_IOS_14 && defined(USE_TI_MEDIAOPENPHOTOGALLERY)
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this covered by the line above?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, but it also goes into the statement if I only use Ti.Media.showCamera or Ti.Media.startVideoEditing. So it throws the compile error once we only the above, but not Ti.Media.openPhotoGallery

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, gotcha. If one of the other OR segments passes, we don't guard properly. OK!

@sgtcoolguy sgtcoolguy modified the milestones: 9.3.0, 9.2.2 Oct 19, 2020
@sgtcoolguy sgtcoolguy merged commit 5e2b5a4 into tidev:master Oct 19, 2020
@build build mentioned this pull request Oct 19, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sgtcoolguy sgtcoolguy sgtcoolguy approved these changes

Assignees
No one assigned
Labels
bug community 🔥 ios no tests
Projects
None yet
Milestone
9.2.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hansemannn @build @sgtcoolguy