From 093ac42f98d12ebd44f1637b2ed1586022b354a5 Mon Sep 17 00:00:00 2001 From: Godefroy Ponsinet Date: Fri, 7 Jun 2019 15:30:48 +0200 Subject: [PATCH] fix(rn): devtools daemon bridge Signed-off-by: Godefroy Ponsinet --- .../screen/Accounts/Onboarding/Bluetooth.js | 4 ++-- .../view/screen/Settings/Devtools/Database.js | 2 +- .../app/view/screen/Settings/Devtools/List.js | 20 +++++++++---------- .../Settings/Devtools/Network/Config.js | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/react-native/app/view/screen/Accounts/Onboarding/Bluetooth.js b/client/react-native/app/view/screen/Accounts/Onboarding/Bluetooth.js index c5f69d9987..d4f6b7bd83 100644 --- a/client/react-native/app/view/screen/Accounts/Onboarding/Bluetooth.js +++ b/client/react-native/app/view/screen/Accounts/Onboarding/Bluetooth.js @@ -32,11 +32,11 @@ const Bluetooth = ({ bridge, navigation, t }) => ( { - const config = await bridge.getNetworkConfig({}) + const config = await bridge.daemon.getNetworkConfig({}) let currentConfig = JSON.parse(config.json) currentConfig.BLE = true - await bridge.updateNetworkConfig({ + await bridge.daemon.updateNetworkConfig({ json: JSON.stringify(currentConfig), }) navigation.navigate('onboarding/contacts') diff --git a/client/react-native/app/view/screen/Settings/Devtools/Database.js b/client/react-native/app/view/screen/Settings/Devtools/Database.js index c5dc6519d8..a9338ac8d6 100644 --- a/client/react-native/app/view/screen/Settings/Devtools/Database.js +++ b/client/react-native/app/view/screen/Settings/Devtools/Database.js @@ -37,7 +37,7 @@ class Database extends PureComponent { this.props.navigation.setParams({ dropDatabase: true }) try { - await bridge.dropDatabase({}) + await bridge.daemon.dropDatabase({}) } catch (err) { Alert.alert('An error occured, please, kill and restart the app') console.error(err) diff --git a/client/react-native/app/view/screen/Settings/Devtools/List.js b/client/react-native/app/view/screen/Settings/Devtools/List.js index 5a07cedaee..b3b1c0c1d1 100644 --- a/client/react-native/app/view/screen/Settings/Devtools/List.js +++ b/client/react-native/app/view/screen/Settings/Devtools/List.js @@ -36,7 +36,7 @@ class List extends PureComponent { this.props.navigation.setParams({ restartDaemon: true }) this.setState({ restartDaemon: true }, async () => { try { - await bridge.restart({}) + await bridge.daemon.restart({}) } catch (err) { console.error(err) } @@ -52,7 +52,7 @@ class List extends PureComponent { this.props.navigation.setParams({ testPanic: true }) this.setState({ testPanic: true }, async () => { - await bridge.panic({}) + await bridge.daemon.panic({}) this.props.navigation.setParams({ testPanic: false, @@ -66,7 +66,7 @@ class List extends PureComponent { this.props.navigation.setParams({ testError: true }) this.setState({ testError: true }, async () => { - await bridge.error({}) + await bridge.daemon.error({}) this.props.navigation.setParams({ testError: false, @@ -112,7 +112,7 @@ class List extends PureComponent { const { bridge } = this.props try { - const { isBotRunning } = await bridge.getBotState({}) + const { isBotRunning } = await bridge.daemon.getBotState({}) this.setState({ botRunning: isBotRunning, @@ -132,9 +132,9 @@ class List extends PureComponent { this.antispamBot = true try { if (this.state.botRunning === true) { - await bridge.stopBot({}) + await bridge.daemon.stopBot({}) } else { - await bridge.startBot({}) + await bridge.daemon.startBot({}) } this.setState({ botRunning: !this.state.botRunning }) @@ -150,7 +150,7 @@ class List extends PureComponent { const { bridge } = this.props try { - let config = await bridge.getLocalGrpcInfos({}) + let config = await bridge.daemon.getLocalGrpcInfos({}) let infos = JSON.parse(config.json) this.setState({ @@ -171,9 +171,9 @@ class List extends PureComponent { this.antispamLocalGRPC = true try { if (this.state.localGRPCRunning === true) { - await bridge.stopLocalGRPC({}) + await bridge.daemon.stopLocalGRPC({}) } else { - await bridge.startLocalGRPC({}) + await bridge.daemon.startLocalGRPC({}) } this.setState({ localGRPCRunning: !this.state.localGRPCRunning }) @@ -192,7 +192,7 @@ class List extends PureComponent { throwNativeException = () => { const { bridge } = this.props - bridge.throwException({}).catch(err => { + bridge.daemon.throwException({}).catch(err => { Alert.alert('Error', `${err}`) }) } diff --git a/client/react-native/app/view/screen/Settings/Devtools/Network/Config.js b/client/react-native/app/view/screen/Settings/Devtools/Network/Config.js index 453bf7583b..4ae2183f37 100644 --- a/client/react-native/app/view/screen/Settings/Devtools/Network/Config.js +++ b/client/react-native/app/view/screen/Settings/Devtools/Network/Config.js @@ -26,7 +26,7 @@ class Network extends PureComponent { async componentDidMount () { const { bridge } = this.props - const config = await bridge.getNetworkConfig({}) + const config = await bridge.daemon.getNetworkConfig({}) console.warn(config.json) this.setState(JSON.parse(config.json)) } @@ -38,7 +38,7 @@ class Network extends PureComponent { this.props.navigation.setParams({ updating: true }) this.setState(config, async () => { try { - await bridge.updateNetworkConfig({ + await bridge.daemon.updateNetworkConfig({ json: JSON.stringify(this.state), }) } catch (err) {