From c38a55d98f2d8589be91d81bc1ea27d7d60e8875 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Thu, 27 Jun 2019 06:53:11 -0700 Subject: [PATCH] Clear entries from the device when logs are cleared Summary: Before this diff "Clear Logs" didn't used to clear the log entries from the redux store. It just used to update the state, so when you switched back from other plugins, all previous log information used to pop up again. This diff fixes that. Reviewed By: passy Differential Revision: D16012710 fbshipit-source-id: 4393520ab6f77caa5f286e22446d2cb6d0827d71 --- src/devices/AndroidDevice.js | 1 + src/devices/ArchivedDevice.js | 5 +++++ src/devices/BaseDevice.js | 1 + 3 files changed, 7 insertions(+) diff --git a/src/devices/AndroidDevice.js b/src/devices/AndroidDevice.js index 0c48b39c5..974bdc6a1 100644 --- a/src/devices/AndroidDevice.js +++ b/src/devices/AndroidDevice.js @@ -84,6 +84,7 @@ export default class AndroidDevice extends BaseDevice { } clearLogs(): Promise { + this.logEntries = []; return child_process_promise.spawn('adb', ['logcat', '-c']); } diff --git a/src/devices/ArchivedDevice.js b/src/devices/ArchivedDevice.js index faf324583..0c82316c4 100644 --- a/src/devices/ArchivedDevice.js +++ b/src/devices/ArchivedDevice.js @@ -39,6 +39,11 @@ export default class ArchivedDevice extends BaseDevice { return this.logs; } + clearLogs(): Promise { + this.logs = []; + return Promise.resolve(); + } + spawnShell(): ?DeviceShell { return null; } diff --git a/src/devices/BaseDevice.js b/src/devices/BaseDevice.js index c44eb5e9a..62bdc000e 100644 --- a/src/devices/BaseDevice.js +++ b/src/devices/BaseDevice.js @@ -127,6 +127,7 @@ export default class BaseDevice { clearLogs(): Promise { // Only for device types that allow clearing. + this.logEntries = []; return Promise.resolve(); }