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.

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

Make possible screenshots on hybrid sdks (react-native) #2360

Merged
merged 33 commits into from Nov 21, 2022
Merged
Changes from 2 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
fc20d26
Fix do not add screenshots if should not apply scope data, make setCu…
krystofwoldrich Nov 14, 2022
d9a2e69
Format code
getsentry-bot Nov 14, 2022
6615b75
Expose ScreenshotEventProcessor to allow HybridSDKs to use it
krystofwoldrich Nov 14, 2022
0dddd51
Merge remote-tracking branch 'origin/feat-screenshots-for-hybrid-sdks…
krystofwoldrich Nov 15, 2022
d7b8109
Revert gradle.properties
krystofwoldrich Nov 15, 2022
33eb7e2
Format code
getsentry-bot Nov 15, 2022
98459b9
Return correctly when invalid activity
krystofwoldrich Nov 15, 2022
ba66365
Update api
krystofwoldrich Nov 15, 2022
465bbf3
Extract screenshot logic to static method, create activity holder sin…
krystofwoldrich Nov 16, 2022
97c3233
Merge branch 'main' into feat-screenshots-for-hybrid-sdks
krystofwoldrich Nov 16, 2022
706dc8e
Format code
getsentry-bot Nov 16, 2022
8c89da7
Refactor
krystofwoldrich Nov 16, 2022
2cce844
Make logger public
krystofwoldrich Nov 16, 2022
66b4e9e
Add configurable tag to android logger
krystofwoldrich Nov 16, 2022
fde7981
Format code
getsentry-bot Nov 16, 2022
ec05044
Update sentry-android-core/src/main/java/io/sentry/android/core/Andro…
krystofwoldrich Nov 16, 2022
2e19e51
Fix activity holder access, return build info
krystofwoldrich Nov 16, 2022
42e606b
Format code
getsentry-bot Nov 16, 2022
5aee06d
Merge branch 'main' into feat-screenshots-for-hybrid-sdks
krystofwoldrich Nov 16, 2022
0299512
Fix lint
krystofwoldrich Nov 16, 2022
6d57ab3
Merge branch 'main' into feat-screenshots-for-hybrid-sdks
krystofwoldrich Nov 16, 2022
03e03b9
Apply suggestions from code review
krystofwoldrich Nov 17, 2022
47e66be
Small refactor and add more hybrid sdks
krystofwoldrich Nov 17, 2022
ce5d2ce
Format code
getsentry-bot Nov 17, 2022
867a810
More refactoring annotations, finals
krystofwoldrich Nov 17, 2022
3e9008d
Add auto close steam
krystofwoldrich Nov 17, 2022
ce00db0
Merge branch 'main' into feat-screenshots-for-hybrid-sdks
krystofwoldrich Nov 21, 2022
0ce3f0e
HintUtils add only class annotation internal
krystofwoldrich Nov 21, 2022
baa0a64
CurrentActivityHolder make constructor private
krystofwoldrich Nov 21, 2022
8ebcaa2
Add changelog (don't attach screenshots to hybridSDKs)
krystofwoldrich Nov 21, 2022
8b49d10
Format code
getsentry-bot Nov 21, 2022
3bb055f
Update changelog
krystofwoldrich Nov 21, 2022
6a469aa
Revert "Update changelog"
krystofwoldrich Nov 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -17,6 +17,7 @@
import io.sentry.Hint;
import io.sentry.SentryEvent;
import io.sentry.SentryLevel;
import io.sentry.util.HintUtils;
import io.sentry.util.Objects;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
Expand Down Expand Up @@ -51,10 +52,17 @@ public ScreenshotEventProcessor(
application.registerActivityLifecycleCallbacks(this);
}

public void setCurrentActivity(@NonNull Activity activity) {
if (currentActivity != null && currentActivity.get() == activity) {
return;
}
currentActivity = new WeakReference<>(activity);
}
krystofwoldrich marked this conversation as resolved.
Show resolved Hide resolved

@SuppressWarnings("NullAway")
@Override
public @NotNull SentryEvent process(final @NotNull SentryEvent event, @NotNull Hint hint) {
if (!lifecycleCallbackInstalled) {
if (!lifecycleCallbackInstalled || !HintUtils.shouldApplyScopeData(hint)) {
krystofwoldrich marked this conversation as resolved.
Show resolved Hide resolved
return event;
}
if (!options.isAttachScreenshot()) {
Expand Down Expand Up @@ -167,13 +175,6 @@ private void cleanCurrentActivity(@NonNull Activity activity) {
}
}

private void setCurrentActivity(@NonNull Activity activity) {
if (currentActivity != null && currentActivity.get() == activity) {
return;
}
currentActivity = new WeakReference<>(activity);
}

@SuppressLint("NewApi")
private boolean isActivityValid(@Nullable Activity activity) {
if (activity == null) {
Expand Down