[FIX] Bugsnag and Analytics opt-out (#3335)

* Deleted redux actions for bugsnag and analytics, in addition fixed to eon/off reports for both

* Removed console.log

* minor tweak

* Enable and disable crashlytics and remove breadcrumb from bugsnag

* minor tweaks with the names of the variables

* minor tweak

Co-authored-by: Diego Mello <diegolmello@gmail.com>

app/actions/actionsTypes.js

@@ -53,8 +53,6 @@ export const LOGOUT = 'LOGOUT'; // logout is always success
 export const SNIPPETED_MESSAGES = createRequestTypes('SNIPPETED_MESSAGES', ['OPEN', 'READY', 'CLOSE', 'MESSAGES_RECEIVED']);
 export const DEEP_LINKING = createRequestTypes('DEEP_LINKING', ['OPEN']);
 export const SORT_PREFERENCES = createRequestTypes('SORT_PREFERENCES', ['SET_ALL', 'SET']);
-export const TOGGLE_CRASH_REPORT = 'TOGGLE_CRASH_REPORT';
-export const TOGGLE_ANALYTICS_EVENTS = 'TOGGLE_ANALYTICS_EVENTS';
 export const SET_CUSTOM_EMOJIS = 'SET_CUSTOM_EMOJIS';
 export const SET_ACTIVE_USERS = 'SET_ACTIVE_USERS';
 export const USERS_TYPING = createRequestTypes('USERS_TYPING', ['ADD', 'REMOVE', 'CLEAR']);

app/actions/crashReport.js

@@ -1,15 +0,0 @@
-import * as types from './actionsTypes';
-
-export function toggleCrashReport(value) {
-	return {
-		type: types.TOGGLE_CRASH_REPORT,
-		payload: value
-	};
-}
-
-export function toggleAnalyticsEvents(value) {
-	return {
-		type: types.TOGGLE_ANALYTICS_EVENTS,
-		payload: value
-	};
-}

app/index.js

@@ -19,7 +19,7 @@ import { deepLinkingOpen } from './actions/deepLinking';
 import parseQuery from './lib/methods/helpers/parseQuery';
 import { initializePushNotifications, onNotification } from './notifications/push';
 import store from './lib/createStore';
-import { loggerConfig, analytics } from './utils/log';
+import { toggleAnalyticsEventsReport, toggleCrashErrorsReport } from './utils/log';
 import { ThemeContext } from './theme';
 import { DimensionsContext } from './dimensions';
 import RocketChat, { THEME_PREFERENCES_KEY } from './lib/rocketchat';
@@ -188,11 +188,11 @@ export default class Root extends React.Component {
 	initCrashReport = () => {
 		RocketChat.getAllowCrashReport()
 			.then((allowCrashReport) => {
-				if (!allowCrashReport) {
+				toggleCrashErrorsReport(allowCrashReport);
-					loggerConfig.autoNotify = false;
+			});
-					loggerConfig.registerBeforeSendCallback(() => false);
+		RocketChat.getAllowAnalyticsEvents()
-					analytics().setAnalyticsCollectionEnabled(false);
+			.then((allowAnalyticsEvents) => {
-				}
+				toggleAnalyticsEventsReport(allowAnalyticsEvents);
 			});
 	}
 

app/reducers/crashReport.js

@@ -1,25 +0,0 @@
-import { TOGGLE_CRASH_REPORT, TOGGLE_ANALYTICS_EVENTS } from '../actions/actionsTypes';
-
-const initialState = {
-	allowCrashReport: false,
-	allowAnalyticsEvents: false
-};
-
-
-export default (state = initialState, action) => {
-	switch (action.type) {
-		case TOGGLE_CRASH_REPORT:
-			return {
-				...state,
-				allowCrashReport: action.payload
-			};
-
-		case TOGGLE_ANALYTICS_EVENTS:
-			return {
-				...state,
-				allowAnalyticsEvents: action.payload
-			};
-		default:
-			return state;
-	}
-};

app/reducers/index.js

@@ -10,7 +10,6 @@ import createChannel from './createChannel';
 import app from './app';
 import sortPreferences from './sortPreferences';
 import share from './share';
-import crashReport from './crashReport';
 import customEmojis from './customEmojis';
 import activeUsers from './activeUsers';
 import usersTyping from './usersTyping';
@@ -35,7 +34,6 @@ export default combineReducers({
 	rooms,
 	sortPreferences,
 	share,
-	crashReport,
 	customEmojis,
 	activeUsers,
 	usersTyping,

app/sagas/init.js

@@ -4,7 +4,6 @@ import RNBootSplash from 'react-native-bootsplash';
 import UserPreferences from '../lib/userPreferences';
 import { selectServerRequest } from '../actions/server';
 import { setAllPreferences } from '../actions/sortPreferences';
-import { toggleCrashReport, toggleAnalyticsEvents } from '../actions/crashReport';
 import { APP } from '../actions/actionsTypes';
 import RocketChat from '../lib/rocketchat';
 import log from '../utils/log';
@@ -15,12 +14,6 @@ import { appStart, ROOT_OUTSIDE, appReady } from '../actions/app';
 export const initLocalSettings = function* initLocalSettings() {
 	const sortPreferences = yield RocketChat.getSortPreferences();
 	yield put(setAllPreferences(sortPreferences));
-
-	const allowCrashReport = yield RocketChat.getAllowCrashReport();
-	yield put(toggleCrashReport(allowCrashReport));
-
-	const allowAnalyticsEvents = yield RocketChat.getAllowAnalyticsEvents();
-	yield put(toggleAnalyticsEvents(allowAnalyticsEvents));
 };
 
 const restore = function* restore() {

app/utils/log/index.js

@@ -5,10 +5,24 @@ import events from './events';
 const analytics = firebaseAnalytics || '';
 let bugsnag = '';
 let crashlytics;
+let reportCrashErrors = true;
+let reportAnalyticsEvents = true;
+
+export const getReportCrashErrorsValue = () => reportCrashErrors;
+export const getReportAnalyticsEventsValue = () => reportAnalyticsEvents;
+
 
 if (!isFDroidBuild) {
 	bugsnag = require('@bugsnag/react-native').default;
-	bugsnag.start();
+	bugsnag.start({
+		onBreadcrumb() {
+			return reportAnalyticsEvents;
+		},
+		onError(error) {
+			if (!reportAnalyticsEvents) { error.breadcrumbs = []; }
+			return reportCrashErrors;
+		}
+	});
 	crashlytics = require('@react-native-firebase/crashlytics').default;
 }
 
@@ -42,6 +56,16 @@ export const setCurrentScreen = (currentScreen) => {
 	}
 };
 
+export const toggleCrashErrorsReport = (value) => {
+	crashlytics().setCrashlyticsCollectionEnabled(value);
+	return reportCrashErrors = value;
+};
+
+export const toggleAnalyticsEventsReport = (value) => {
+	analytics().setAnalyticsCollectionEnabled(value);
+	return reportAnalyticsEvents = value;
+};
+
 export default (e) => {
 	if (e instanceof Error && bugsnag && e.message !== 'Aborted' && !__DEV__) {
 		bugsnag.notify(e, (event) => {

app/views/SecurityPrivacyView.js

@@ -1,158 +1,119 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Switch } from 'react-native';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import AsyncStorage from '@react-native-community/async-storage';
+import { useSelector } from 'react-redux';
 
-import { toggleCrashReport as toggleCrashReportAction, toggleAnalyticsEvents as toggleAnalyticsEventsAction } from '../actions/crashReport';
 import { SWITCH_TRACK_COLOR } from '../constants/colors';
 import StatusBar from '../containers/StatusBar';
 import * as List from '../containers/List';
 import I18n from '../i18n';
 import { CRASH_REPORT_KEY, ANALYTICS_EVENTS_KEY } from '../lib/rocketchat';
 import {
-	loggerConfig, analytics, logEvent, events
+	logEvent, events, toggleCrashErrorsReport, toggleAnalyticsEventsReport, getReportCrashErrorsValue, getReportAnalyticsEventsValue
 } from '../utils/log';
 import SafeAreaView from '../containers/SafeAreaView';
 import { isFDroidBuild } from '../constants/environment';
-import { getUserSelector } from '../selectors/login';
 
-class SecurityPrivacyView extends React.Component {
+const SecurityPrivacyView = ({ navigation }) => {
-	static navigationOptions = () => ({
+	const [crashReportState, setCrashReportState] = useState(getReportCrashErrorsValue());
-		title: I18n.t('Security_and_privacy')
+	const [analyticsEventsState, setAnalyticsEventsState] = useState(getReportAnalyticsEventsValue());
-	});
 
-	static propTypes = {
+	const { e2eEnabled } = useSelector(state => state.settings);
-		navigation: PropTypes.object,
-		allowCrashReport: PropTypes.bool,
-		allowAnalyticsEvents: PropTypes.bool,
-		e2eEnabled: PropTypes.bool,
-		toggleCrashReport: PropTypes.func,
-		toggleAnalyticsEvents: PropTypes.func,
-		user: PropTypes.shape({
-			roles: PropTypes.array,
-			id: PropTypes.string
-		})
-	}
 
-	toggleCrashReport = (value) => {
+	useEffect(() => {
+		navigation.setOptions({
+			title: I18n.t('Security_and_privacy')
+		});
+	}, []);
+
+	const toggleCrashReport = (value) => {
 		logEvent(events.SE_TOGGLE_CRASH_REPORT);
 		AsyncStorage.setItem(CRASH_REPORT_KEY, JSON.stringify(value));
-		const { toggleCrashReport } = this.props;
+		setCrashReportState(value);
-		toggleCrashReport(value);
+		toggleCrashErrorsReport(value);
-		if (!isFDroidBuild) {
+	};
-			loggerConfig.autoNotify = value;
-			if (value) {
-				loggerConfig.clearBeforeSendCallbacks();
-			} else {
-				loggerConfig.registerBeforeSendCallback(() => false);
-			}
-		}
-	}
 
-	toggleAnalyticsEvents = (value) => {
+	const toggleAnalyticsEvents = (value) => {
 		logEvent(events.SE_TOGGLE_ANALYTICS_EVENTS);
-		const { toggleAnalyticsEvents } = this.props;
 		AsyncStorage.setItem(ANALYTICS_EVENTS_KEY, JSON.stringify(value));
-		toggleAnalyticsEvents(value);
+		setAnalyticsEventsState(value);
-		analytics().setAnalyticsCollectionEnabled(value);
+		toggleAnalyticsEventsReport(value);
-	}
+	};
 
-	navigateToScreen = (screen) => {
+	const navigateToScreen = (screen) => {
 		logEvent(events[`SP_GO_${ screen.replace('View', '').toUpperCase() }`]);
-		const { navigation } = this.props;
 		navigation.navigate(screen);
-	}
+	};
 
-	renderCrashReportSwitch = () => {
+	return (
-		const { allowCrashReport } = this.props;
+		<SafeAreaView testID='security-privacy-view'>
-		return (
+			<StatusBar />
-			<Switch
+			<List.Container testID='security-privacy-view-list'>
-				value={allowCrashReport}
+				<List.Section>
-				trackColor={SWITCH_TRACK_COLOR}
+					<List.Separator />
-				onValueChange={this.toggleCrashReport}
+					{e2eEnabled
-			/>
+						? (
-		);
+							<>
-	}
+								<List.Item
+									title='E2E_Encryption'
+									showActionIndicator
+									onPress={() => navigateToScreen('E2EEncryptionSecurityView')}
+									testID='security-privacy-view-e2e-encryption'
+								/>
+								<List.Separator />
+							</>
+						)
+						: null
+					}
+					<List.Item
+						title='Screen_lock'
+						showActionIndicator
+						onPress={() => navigateToScreen('ScreenLockConfigView')}
+						testID='security-privacy-view-screen-lock'
+					/>
+					<List.Separator />
+				</List.Section>
 
-	renderAnalyticsEventsSwitch = () => {
+				{!isFDroidBuild ? (
-		const { allowAnalyticsEvents } = this.props;
+					<>
-		return (
+						<List.Section>
-			<Switch
+							<List.Separator />
-				value={allowAnalyticsEvents}
+							<List.Item
-				trackColor={SWITCH_TRACK_COLOR}
+								title='Log_analytics_events'
-				onValueChange={this.toggleAnalyticsEvents}
+								testID='security-privacy-view-analytics-events'
-			/>
+								right={() => (
-		);
+									<Switch
-	}
+										value={analyticsEventsState}
-
+										trackColor={SWITCH_TRACK_COLOR}
-	render() {
+										onValueChange={toggleAnalyticsEvents}
-		const { e2eEnabled } = this.props;
-		return (
-			<SafeAreaView testID='security-privacy-view'>
-				<StatusBar />
-				<List.Container testID='security-privacy-view-list'>
-					<List.Section>
-						<List.Separator />
-						{e2eEnabled
-							? (
-								<>
-									<List.Item
-										title='E2E_Encryption'
-										showActionIndicator
-										onPress={() => this.navigateToScreen('E2EEncryptionSecurityView')}
-										testID='security-privacy-view-e2e-encryption'
 									/>
-									<List.Separator />
+								)}
-								</>
+							/>
-							)
+							<List.Separator />
-							: null
+							<List.Item
-						}
+								title='Send_crash_report'
-						<List.Item
+								testID='security-privacy-view-crash-report'
-							title='Screen_lock'
+								right={() => (
-							showActionIndicator
+									<Switch
-							onPress={() => this.navigateToScreen('ScreenLockConfigView')}
+										value={crashReportState}
-							testID='security-privacy-view-screen-lock'
+										trackColor={SWITCH_TRACK_COLOR}
-						/>
+										onValueChange={toggleCrashReport}
-						<List.Separator />
+									/>
-					</List.Section>
+								)}
+							/>
+							<List.Separator />
+							<List.Info info='Crash_report_disclaimer' />
+						</List.Section>
+					</>
+				) : null}
+			</List.Container>
+		</SafeAreaView>
+	);
+};
 
-					{!isFDroidBuild ? (
+SecurityPrivacyView.propTypes = {
-						<>
+	navigation: PropTypes.object
-							<List.Section>
+};
-								<List.Separator />
-								<List.Item
-									title='Log_analytics_events'
-									testID='security-privacy-view-analytics-events'
-									right={() => this.renderAnalyticsEventsSwitch()}
-								/>
-								<List.Separator />
-								<List.Item
-									title='Send_crash_report'
-									testID='security-privacy-view-crash-report'
-									right={() => this.renderCrashReportSwitch()}
-								/>
-								<List.Separator />
-								<List.Info info='Crash_report_disclaimer' />
-							</List.Section>
-						</>
-					) : null}
-				</List.Container>
-			</SafeAreaView>
-		);
-	}
-}
 
-const mapStateToProps = state => ({
+export default SecurityPrivacyView;
-	user: getUserSelector(state),
-	allowCrashReport: state.crashReport.allowCrashReport,
-	allowAnalyticsEvents: state.crashReport.allowAnalyticsEvents,
-	e2eEnabled: state.settings.E2E_Enable
-});
-
-const mapDispatchToProps = dispatch => ({
-	toggleCrashReport: params => dispatch(toggleCrashReportAction(params)),
-	toggleAnalyticsEvents: params => dispatch(toggleAnalyticsEventsAction(params))
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(SecurityPrivacyView);