Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ public static native boolean initialize(String url, String databasePath, String


public static native void addAttribute(String name, String value);

public static native void addAttachment(String attachmentPath);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
import android.content.Context;

import java.io.File;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;

import backtraceio.library.nativeCalls.*;
import backtraceio.library.models.nativeHandler.CrashHandlerConfiguration;
Expand All @@ -33,6 +36,8 @@ public class BacktraceReactNative extends ReactContextBaseJavaModule {

private final Context context;

private final Set<String> registeredAttachments = new HashSet<>();

public BacktraceReactNative(ReactApplicationContext reactContext) {
super(reactContext);
this.context = reactContext.getApplicationContext();
Expand All @@ -58,16 +63,20 @@ public Boolean initialize(String minidumpSubmissionUrl, String databasePath, Rea
String[] keys = attributes.keySet().toArray(new String[0]);
String[] values = attributes.values().toArray(new String[0]);

String[] attachments = attachmentPaths.toArrayList().toArray(new String[0]);

BacktraceCrashHandlerWrapper nativeCommunication = new BacktraceCrashHandlerWrapper();
Boolean result = nativeCommunication.initializeJavaCrashHandler(
minidumpSubmissionUrl,
databasePath,
crashHandlerConfiguration.getClassPath(),
keys,
values,
attachmentPaths.toArrayList().toArray(new String[0]),
attachments,
crashHandlerConfiguration.getCrashHandlerEnvironmentVariables(this.context.getApplicationInfo()).toArray(new String[0])
);
);

this.registeredAttachments.addAll(Arrays.asList(attachments));

return result;
}
Expand All @@ -85,6 +94,18 @@ public void useAttributes(ReadableMap readableAttributes) {
}


@ReactMethod()
public void useAttachments(ReadableArray attachmentPaths) {
for (int attachmentIndex = 0; attachmentIndex < attachmentPaths.size(); attachmentIndex++) {
String attachmentPath = attachmentPaths.getString(attachmentIndex);
if (attachmentPath == null || !this.registeredAttachments.add(attachmentPath)) {
continue;
}
BacktraceDatabase.addAttachment(attachmentPath);
}
}


@ReactMethod()
public void crash() {
BacktraceBase.crash();
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/src/crashReporter/CrashReporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export class CrashReporter {
if (!this._enabled) {
return;
}
// Android does not expose useAttachments.
if (typeof CrashReporter.BacktraceReactNative.useAttachments !== 'function') {
return;
}
Expand Down
Loading