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

chore(deps): update Android SDK to v6.13.0 #2790

Merged
merged 3 commits into from
Jan 30, 2023
Merged

chore(deps): update Android SDK to v6.13.0 #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c652d8f
chore: update scripts/update-android.sh to 6.13.0
web-flow Jan 27, 2023
1af3702
Fix app start time nanoTimestamp change
krystofwoldrich Jan 30, 2023
9483dec
Use date utils for conversion nano to millis
krystofwoldrich Jan 30, 2023
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## Unreleased

### Dependencies

- Bump Android SDK from v6.12.1 to v6.13.0 ([#2790](https://github.com/getsentry/sentry-react-native/pull/2790))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6130)
- [diff](https://github.com/getsentry/sentry-java/compare/6.12.1...6.13.0)

## 4.14.0

### Features
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ android {

dependencies {
implementation 'com.facebook.react:react-native:+'
api 'io.sentry:sentry-android:6.12.1'
api 'io.sentry:sentry-android:6.13.0'
}
9 changes: 5 additions & 4 deletions android/src/main/java/io/sentry/react/RNSentryModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -41,10 +40,12 @@
import java.util.concurrent.TimeUnit;

import io.sentry.Breadcrumb;
import io.sentry.DateUtils;
import io.sentry.HubAdapter;
import io.sentry.ILogger;
import io.sentry.Integration;
import io.sentry.Sentry;
import io.sentry.SentryDate;
import io.sentry.SentryEvent;
import io.sentry.SentryLevel;
import io.sentry.UncaughtExceptionHandlerIntegration;
Expand Down Expand Up @@ -234,7 +235,7 @@ public void fetchNativeRelease(Promise promise) {
@ReactMethod
public void fetchNativeAppStart(Promise promise) {
final AppStartState appStartInstance = AppStartState.getInstance();
final Date appStartTime = appStartInstance.getAppStartTime();
final SentryDate appStartTime = appStartInstance.getAppStartTime();
final Boolean isColdStart = appStartInstance.isColdStart();

if (appStartTime == null) {
Expand All @@ -244,11 +245,11 @@ public void fetchNativeAppStart(Promise promise) {
logger.log(SentryLevel.WARNING, "App start won't be sent due to missing isColdStart.");
promise.resolve(null);
} else {
final double appStartTimestamp = (double) appStartTime.getTime();
final double appStartTimestampMs = DateUtils.nanosToMillis(appStartTime.nanoTimestamp());

WritableMap appStart = Arguments.createMap();

appStart.putDouble("appStartTime", appStartTimestamp);
appStart.putDouble("appStartTime", appStartTimestampMs);
appStart.putBoolean("isColdStart", isColdStart);
appStart.putBoolean("didFetchAppStart", didFetchAppStart);

Expand Down