fixes
This commit is contained in:
parent
ed42199ad8
commit
512a7774d0
|
@ -6,6 +6,7 @@ import RNUserDefaults from 'rn-user-defaults';
|
|||
import { KeyCommandsEmitter } from 'react-native-keycommands';
|
||||
import RNScreens from 'react-native-screens';
|
||||
import { SafeAreaProvider, initialWindowMetrics } from 'react-native-safe-area-context';
|
||||
import RNConfigReader from 'react-native-config-reader';
|
||||
|
||||
import {
|
||||
defaultTheme,
|
||||
|
@ -40,6 +41,8 @@ import debounce from './utils/debounce';
|
|||
|
||||
RNScreens.enableScreens();
|
||||
|
||||
const configValue = RNConfigReader.PLAY_BUILD;
|
||||
|
||||
const parseDeepLinking = (url) => {
|
||||
if (url) {
|
||||
url = url.replace(/rocketchat:\/\/|https:\/\/go.rocket.chat\//, '');
|
||||
|
@ -160,7 +163,9 @@ export default class Root extends React.Component {
|
|||
if (!allowCrashReport) {
|
||||
loggerConfig.autoNotify = false;
|
||||
loggerConfig.registerBeforeSendCallback(() => false);
|
||||
analytics().setAnalyticsCollectionEnabled(false);
|
||||
if (configValue) {
|
||||
analytics().setAnalyticsCollectionEnabled(false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
import EJSON from 'ejson';
|
||||
|
||||
import RNConfigReader from 'react-native-config-reader';
|
||||
import PushNotification from './push';
|
||||
import store from '../../lib/createStore';
|
||||
import { deepLinkingOpen } from '../../actions/deepLinking';
|
||||
import RNConfigReader from 'react-native-config-reader';
|
||||
|
||||
export const onNotification = (notification) => {
|
||||
if (notification) {
|
||||
|
@ -39,7 +38,7 @@ export const getDeviceToken = () => PushNotification.getDeviceToken();
|
|||
export const setBadgeCount = count => PushNotification.setBadgeCount(count);
|
||||
export const initializePushNotifications = () => {
|
||||
const configValue = RNConfigReader.PLAY_BUILD;
|
||||
if(configValue){
|
||||
if (configValue) {
|
||||
setBadgeCount();
|
||||
return PushNotification.configure({
|
||||
onNotification
|
||||
|
|
|
@ -6,7 +6,7 @@ import config from '../../config';
|
|||
const configValue = RNConfigReader.PLAY_BUILD;
|
||||
const bugsnag = new Client(config.BUGSNAG_API_KEY);
|
||||
|
||||
export const { analytics } = firebase;
|
||||
export const { analytics } = firebase != null;
|
||||
export const loggerConfig = bugsnag.config;
|
||||
export const { leaveBreadcrumb } = bugsnag;
|
||||
|
||||
|
@ -19,7 +19,7 @@ export const logServerVersion = (serverVersion) => {
|
|||
};
|
||||
|
||||
export const setCurrentScreen = (currentScreen) => {
|
||||
if(configValue){
|
||||
if (configValue) {
|
||||
analytics().setCurrentScreen(currentScreen);
|
||||
}
|
||||
leaveBreadcrumb(currentScreen, { type: 'navigation' });
|
||||
|
|
|
@ -5,6 +5,7 @@ import {
|
|||
} from 'react-native';
|
||||
import { connect } from 'react-redux';
|
||||
import equal from 'deep-equal';
|
||||
import RNConfigReader from 'react-native-config-reader';
|
||||
|
||||
import { analytics } from '../utils/log';
|
||||
import sharedStyles from './Styles';
|
||||
|
@ -18,6 +19,8 @@ import TextInput from '../containers/TextInput';
|
|||
import { loginRequest as loginRequestAction } from '../actions/login';
|
||||
import LoginServices from '../containers/LoginServices';
|
||||
|
||||
const configValue = RNConfigReader.PLAY_BUILD;
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
registerDisabled: {
|
||||
...sharedStyles.textRegular,
|
||||
|
@ -121,7 +124,9 @@ class LoginView extends React.Component {
|
|||
const { loginRequest } = this.props;
|
||||
Keyboard.dismiss();
|
||||
loginRequest({ user, password });
|
||||
analytics().logEvent('login');
|
||||
if (configValue) {
|
||||
analytics().logEvent('login');
|
||||
}
|
||||
}
|
||||
|
||||
renderUserForm = () => {
|
||||
|
|
|
@ -5,6 +5,7 @@ import {
|
|||
import PropTypes from 'prop-types';
|
||||
import { connect } from 'react-redux';
|
||||
import AsyncStorage from '@react-native-community/async-storage';
|
||||
import RNConfigReader from 'react-native-config-reader';
|
||||
|
||||
import { logout as logoutAction } from '../../actions/login';
|
||||
import { selectServerRequest as selectServerRequestAction } from '../../actions/server';
|
||||
|
@ -36,6 +37,8 @@ import { onReviewPress } from '../../utils/review';
|
|||
import { getUserSelector } from '../../selectors/login';
|
||||
import SafeAreaView from '../../containers/SafeAreaView';
|
||||
|
||||
const configValue = RNConfigReader.PLAY_BUILD;
|
||||
|
||||
const SectionSeparator = React.memo(({ theme }) => (
|
||||
<View
|
||||
style={[
|
||||
|
@ -115,7 +118,9 @@ class SettingsView extends React.Component {
|
|||
const { toggleCrashReport } = this.props;
|
||||
toggleCrashReport(value);
|
||||
loggerConfig.autoNotify = value;
|
||||
analytics().setAnalyticsCollectionEnabled(value);
|
||||
if (configValue) {
|
||||
analytics().setAnalyticsCollectionEnabled(value);
|
||||
}
|
||||
|
||||
if (value) {
|
||||
loggerConfig.clearBeforeSendCallbacks();
|
||||
|
|
Loading…
Reference in New Issue