From a90422bf2f7092a817e7979637de290ae4f79875 Mon Sep 17 00:00:00 2001 From: Benjamin Elo Date: Thu, 5 Sep 2019 05:57:48 -0700 Subject: [PATCH] Added additional parameters for logging Summary: The navigation plugin supports logging of a date and the class name. This addition adds that support. I have kept the previoius method which I will remove once I update the fb4a navigation plugin integration. Reviewed By: danielbuechele Differential Revision: D17202996 fbshipit-source-id: eac95328a6e2278c3a27ca608b9b675c8efe4528 --- .../navigation/NavigationFlipperPlugin.java | 15 ++++++++++++++- src/plugins/navigation/index.tsx | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/plugins/navigation/NavigationFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/navigation/NavigationFlipperPlugin.java index 6d49a588a..f4ca3bdd4 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/navigation/NavigationFlipperPlugin.java +++ b/android/src/main/java/com/facebook/flipper/plugins/navigation/NavigationFlipperPlugin.java @@ -12,6 +12,7 @@ import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperPlugin; import com.facebook.flipper.core.FlipperReceiver; import com.facebook.flipper.core.FlipperResponder; +import java.util.Date; public class NavigationFlipperPlugin implements FlipperPlugin { @@ -21,9 +22,21 @@ public class NavigationFlipperPlugin implements FlipperPlugin { private NavigationFlipperPlugin() {} + @Deprecated public void sendNavigationEvent(@Nullable String keyURI) { + sendNavigationEvent(keyURI, null, null); + } + + public void sendNavigationEvent( + @Nullable String keyURI, @Nullable String className, @Nullable Date date) { if (mConnection != null) { - mConnection.send("nav_event", new FlipperObject.Builder().put("uri", keyURI).build()); + FlipperObject sendObject = + new FlipperObject.Builder() + .put("uri", keyURI) + .put("date", date != null ? date : new Date()) + .put("class", className) + .build(); + mConnection.send("nav_event", sendObject); } } diff --git a/src/plugins/navigation/index.tsx b/src/plugins/navigation/index.tsx index 6355153ad..15390e65a 100644 --- a/src/plugins/navigation/index.tsx +++ b/src/plugins/navigation/index.tsx @@ -68,7 +68,7 @@ export default class extends FlipperPlugin { const {setPersistedState} = this.props; const navigationEvent: NavigationEvent = { uri: payload.uri === undefined ? null : decodeURIComponent(payload.uri), - date: payload.date || new Date(), + date: new Date(payload.date) || new Date(), className: payload.class === undefined ? null : payload.class, screenshot: null, };