diff --git a/android/src/main/java/com/facebook/flipper/plugins/crashreporter/CrashReporterPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/crashreporter/CrashReporterPlugin.java index 1326dd202..30a655fd5 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/crashreporter/CrashReporterPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/crashreporter/CrashReporterPlugin.java @@ -1,14 +1,13 @@ /** * Copyright (c) Facebook, Inc. and its affiliates. * - *
This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
*/
package com.facebook.flipper.plugins.crashreporter;
import android.app.Activity;
import android.support.annotation.Nullable;
-import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperPlugin;
@@ -57,15 +56,18 @@ public class CrashReporterPlugin implements FlipperPlugin {
public void sendExceptionMessage(Thread paramThread, Throwable paramThrowable) {
if (mConnection != null) {
FlipperConnection connection = mConnection;
- FlipperArray.Builder builder = new FlipperArray.Builder();
- for (StackTraceElement stackTraceElement : paramThrowable.getStackTrace()) {
- builder.put(stackTraceElement.toString());
+ StringBuilder strBuilder = new StringBuilder("");
+ StackTraceElement[] elems = paramThrowable.getStackTrace();
+ for (int i = 0; i < elems.length; ++i) {
+ strBuilder.append(elems[i].toString());
+ if (i < elems.length - 1) {
+ strBuilder.append("\n\tat ");
+ }
}
- FlipperArray arr = builder.build();
connection.send(
"crash-report",
new FlipperObject.Builder()
- .put("callstack", arr)
+ .put("callstack", strBuilder.toString())
.put("name", paramThrowable.toString())
.put("reason", paramThrowable.getMessage())
.build());
diff --git a/iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.mm b/iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.mm
index eba09b397..e1a801533 100644
--- a/iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.mm
+++ b/iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.mm
@@ -16,16 +16,8 @@
@property (assign, nonatomic) NSUInteger notificationID;
@property (assign, nonatomic) NSUncaughtExceptionHandler *prevHandler;
-- (void) handleException:(NSException *)exception;
-
@end
-static void flipperkitUncaughtExceptionHandler(NSException *exception) {
- NSLog(@"CRASH: %@", exception);
- NSLog(@"Stack Trace: %@", [exception callStackSymbols]);
- [[FlipperKitCrashReporterPlugin sharedInstance] handleException:exception];
-}
-
@implementation FlipperKitCrashReporterPlugin {
std::unique_ptr