Skip to content

Workaround thread safety issues accessing Android device data #3802

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

Merged
bruno-garcia merged 7 commits into from
Nov 30, 2024
Merged

Workaround thread safety issues accessing Android device data #3802

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3c12ec
Workaround thread safety issues accessing Android device data
jamescrosswell Nov 28, 2024
f0edaf9
Made locks more specific
jamescrosswell Nov 28, 2024
dc8de9a
Merge branch 'main' into jni-error
jamescrosswell Nov 28, 2024
555a5f9
Update CHANGELOG.md
jamescrosswell Nov 28, 2024
6418acf
Fixed threadsafety issues capturing screenshots from multiple threads…
jamescrosswell Nov 28, 2024
6271ff7
Update ScreenshotAttachment.cs
jamescrosswell Nov 28, 2024
3c4ea18
Update SentryMauiScreenshotTests.cs
jamescrosswell Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ScreenshotAttachment.cs
  • Loading branch information
@jamescrosswell
jamescrosswell committed Nov 28, 2024
commit 6271ff7c883777cf74a0dfea15d3782e543170cb
7 changes: 3 additions & 4 deletions src/Sentry.Maui/Internal/ScreenshotAttachment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@ public Stream GetStream()
{
var stream = Stream.Null;
// Not including this on Windows specific build because on WinUI this can deadlock.
#if !(__ANDROID__ || __IOS__)
return stream;
#endif
#if (__ANDROID__ || __IOS__)
Stream CaptureScreenBlocking()
{
// This actually runs synchronously (returning Task.FromResult) on the following platforms:
Expand All @@ -60,6 +58,7 @@ Stream CaptureScreenBlocking()
return stream;
}

#endif
#if __IOS__
if (MainThread.IsMainThread)
{
Expand All @@ -75,7 +74,7 @@ Stream CaptureScreenBlocking()
return await screen.OpenReadAsync(ScreenshotFormat.Jpeg).ConfigureAwait(true);
}).ConfigureAwait(false).GetAwaiter().GetResult();
}
#else
#elif __ANDROID__
// Capturing screenshots is not threadsafe on Android
lock (JniLock)
{
Expand Down
Loading