diegolmello · Aug 23, 2019 · Aug 1, 2019 · Aug 1, 2019 · Aug 1, 2019 · Aug 1, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -116,10 +116,26 @@ jobs:
     steps:
       - checkout
 
+      - run:
+          name: Install Node 8
+          command: |
+            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
+            source ~/.nvm/nvm.sh
+            # https://github.com/creationix/nvm/issues/1394
+            set +e
+            nvm install 8
+            echo 'export PATH="/home/circleci/.nvm/versions/node/v8.16.0/bin:$PATH"' >> ~/.bash_profile
+            source ~/.bash_profile
+
       - restore_cache:
           name: Restore NPM cache
           key: node-modules-{{ checksum "yarn.lock" }}
 
+      - run:
+          name: Install React Native CLI
+          command: |
+            npm i -g react-native-cli
+
       - run:
           name: Install NPM modules
           command: |
@@ -148,12 +164,32 @@ jobs:
             fi
 
             echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
+            echo -e "BugsnagAPIKey=$BUGSNAG_KEY" >> ./gradle.properties
 
       - run:
           name: Set Google Services
           command: |
-            cd android/app
             cp google-services.prod.json google-services.json
+          working_directory: android/app
+
+      - run:
+          name: Upload sourcemaps to Bugsnag
+          command: |
+            if [[ $BUGSNAG_KEY ]]; then
+              yarn generate-source-maps-android
+              curl https://upload.bugsnag.com/react-native-source-map \
+                -F apiKey=$BUGSNAG_KEY \
+                -F appVersionCode=$CIRCLE_BUILD_NUM \
+                -F dev=false \
+                -F platform=android \
+                -F sourceMap=@android-release.bundle.map \
+                -F bundle=@android-release.bundle
+            fi
+
+      - run:
+          name: Config variables
+          command: |
+            echo -e "export default { BUGSNAG_API_KEY: '$BUGSNAG_KEY' };" > ./config.js
 
       - run:
           name: Build Android App
@@ -215,6 +251,7 @@ jobs:
       - run:
           name: Install NPM modules
           command: |
+            yarn global add react-native react-native-cli
             yarn
 
       - run:
@@ -229,11 +266,26 @@ jobs:
             cp GoogleService-Info.prod.plist GoogleService-Info.plist
           working_directory: ios
 
+      - run:
+          name: Upload sourcemaps to Bugsnag
+          command: |
+            if [[ $BUGSNAG_KEY ]]; then
+              yarn generate-source-maps-ios
+              curl https://upload.bugsnag.com/react-native-source-map \
+                -F apiKey=$BUGSNAG_KEY \
+                -F appBundleVersion=$CIRCLE_BUILD_NUM \
+                -F dev=false \
+                -F platform=ios \
+                -F sourceMap=@ios-release.bundle.map \
+                -F bundle=@ios-release.bundle
+            fi
+
       - run:
           name: Fastlane Build
           no_output_timeout: 1200
           command: |
             agvtool new-version -all $CIRCLE_BUILD_NUM
+            /usr/libexec/PlistBuddy -c "Set BugsnagAPIKey $BUGSNAG_KEY" ./RocketChatRN/Info.plist
 
             if [[ $MATCH_KEYCHAIN_NAME ]]; then
               bundle exec fastlane ios release
@@ -288,7 +340,7 @@ jobs:
       - run:
           name: Fastlane Tesflight Upload
           command: |
-            bundle exec fastlane pilot upload --ipa ios/RocketChatRN.ipa --changelog "$(sh ../.circleci/changelog.sh)"
+            bundle exec fastlane ios beta
           working_directory: ios
 
       - save_cache:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 apply plugin: "io.fabric"
 apply plugin: "com.google.firebase.firebase-perf"
+apply plugin: 'com.bugsnag.android.gradle'
 
 import com.android.build.OutputFile
 
@@ -137,6 +138,7 @@ android {
         versionCode VERSIONCODE as Integer
         versionName "1.19.0"
         vectorDrawables.useSupportLibrary = true
+        manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
     }
 
     signingConfigs {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />  
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
@@ -52,6 +52,9 @@
 					<data android:mimeType="*/*" />
 				</intent-filter>
 		</activity>
+		<meta-data
+				android:name="com.bugsnag.android.API_KEY"
+				android:value="${BugsnagAPIKey}" />
 	</application>
 
 </manifest>
diff --git a/android/build.gradle b/android/build.gradle
@@ -24,6 +24,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'io.fabric.tools:gradle:1.28.1'
         classpath 'com.google.firebase:perf-plugin:1.2.1'
+        classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -50,16 +51,16 @@ allprojects {
     }
 }
 
-// subprojects { subproject ->	
-//     afterEvaluate {	
-//         if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {	
-//             android {	
-//                 compileSdkVersion 28	
-//                 buildToolsVersion "28.0.3"	
-//                 defaultConfig {	
-//                     targetSdkVersion 28	
-//                 }	
-//             }	
-//         }	
-//     }	
-// }
+// subprojects { subproject ->
+//     afterEvaluate {
+//         if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+//             android {
+//                 compileSdkVersion 28
+//                 buildToolsVersion "28.0.3"
+//                 defaultConfig {
+//                     targetSdkVersion 28
+//                 }
+//             }
+//         }
+//     }
+// }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -22,3 +22,4 @@ org.gradle.jvmargs=-Xmx2048M -XX\:MaxHeapSize\=32g
 android.useAndroidX=true
 android.enableJetifier=true
 VERSIONCODE=999999999
+BugsnagAPIKey=""
diff --git a/app/ReactotronConfig.js b/app/ReactotronConfig.js
@@ -18,4 +18,5 @@ if (__DEV__) {
     Reactotron.clear();
     console.warn = Reactotron.log;
     console.log = Reactotron.log;
+    console.disableYellowBox = true;
 }
diff --git a/app/actions/actionsTypes.js b/app/actions/actionsTypes.js
@@ -74,3 +74,4 @@ export const DEEP_LINKING = createRequestTypes('DEEP_LINKING', ['OPEN']);
 export const SORT_PREFERENCES = createRequestTypes('SORT_PREFERENCES', ['SET_ALL', 'SET']);
 export const NOTIFICATION = createRequestTypes('NOTIFICATION', ['RECEIVED', 'REMOVE']);
 export const TOGGLE_MARKDOWN = 'TOGGLE_MARKDOWN';
+export const TOGGLE_CRASH_REPORT = 'TOGGLE_CRASH_REPORT';
diff --git a/app/actions/crashReport.js b/app/actions/crashReport.js
@@ -0,0 +1,8 @@
+import * as types from './actionsTypes';
+
+export function toggleCrashReport(value) {
+	return {
+		type: types.TOGGLE_CRASH_REPORT,
+		payload: value
+	};
+}
diff --git a/app/containers/MessageActions.js b/app/containers/MessageActions.js
@@ -311,7 +311,7 @@ class MessageActions extends React.Component {
 			await RocketChat.reportMessage(actionMessage._id);
 			Alert.alert(I18n.t('Message_Reported'));
 		} catch (err) {
-			log('err_report_message', err);
+			log(err);
 		}
 	}
 
@@ -328,7 +328,7 @@ class MessageActions extends React.Component {
 				await RocketChat.translateMessage(actionMessage, room.autoTranslateLanguage);
 			}
 		} catch (err) {
-			log('err_toggle_translation', err);
+			log(err);
 		}
 	}
 

diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js
@@ -362,7 +362,7 @@ class MessageBox extends Component {
 						try {
 							database.create('users', user, true);
 						} catch (e) {
-							log('err_create_users', e);
+							log(e);
 						}
 					});
 				});
@@ -504,7 +504,7 @@ class MessageBox extends Component {
 		try {
 			await RocketChat.sendFileMessage(rid, fileInfo, tmid, server, user);
 		} catch (e) {
-			log('err_send_media_message', e);
+			log(e);
 		}
 	}
 
@@ -513,7 +513,7 @@ class MessageBox extends Component {
 			const image = await ImagePicker.openCamera(this.imagePickerConfig);
 			this.showUploadModal(image);
 		} catch (e) {
-			log('err_take_photo', e);
+			log(e);
 		}
 	}
 
@@ -522,7 +522,7 @@ class MessageBox extends Component {
 			const video = await ImagePicker.openCamera(this.videoPickerConfig);
 			this.showUploadModal(video);
 		} catch (e) {
-			log('err_take_video', e);
+			log(e);
 		}
 	}
 
@@ -531,7 +531,7 @@ class MessageBox extends Component {
 			const image = await ImagePicker.openPicker(this.libraryPickerConfig);
 			this.showUploadModal(image);
 		} catch (e) {
-			log('err_choose_from_library', e);
+			log(e);
 		}
 	}
 
@@ -618,7 +618,7 @@ class MessageBox extends Component {
 				if (e && e.error === 'error-file-too-large') {
 					return Alert.alert(I18n.t(e.error));
 				}
-				log('err_finish_audio_message', e);
+				log(e);
 			}
 		}
 	}

diff --git a/app/i18n/locales/en.js b/app/i18n/locales/en.js
@@ -407,5 +407,5 @@ export default {
 	Version_no: 'Version: {{version}}',
 	You_will_not_be_able_to_recover_this_message: 'You will not be able to recover this message!',
 	Change_Language: 'Change Language',
-	Crash_report_disclaimer: 'We never track the content of your chats. The crash report only contains relevant information for us in order '
+	Crash_report_disclaimer: 'We never track the content of your chats. The crash report only contains relevant information for us in order to identify problems and fix it.'
 };
diff --git a/app/index.js b/app/index.js
@@ -16,7 +16,9 @@ import { initializePushNotifications, onNotification } from './notifications/pus
 import store from './lib/createStore';
 import NotificationBadge from './notifications/inApp';
 import { defaultHeader, onNavigationStateChange } from './utils/navigation';
+import { loggerConfig, analytics } from './utils/log';
 import Toast from './containers/Toast';
+import RocketChat from './lib/rocketchat';
 
 useScreens();
 
@@ -256,6 +258,7 @@ export default class Root extends React.Component {
 	constructor(props) {
 		super(props);
 		this.init();
+		this.initCrashReport();
 	}
 
 	componentDidMount() {
@@ -285,6 +288,17 @@ export default class Root extends React.Component {
 		}
 	}
 
+	initCrashReport = () => {
+		RocketChat.getAllowCrashReport()
+			.then((allowCrashReport) => {
+				if (!allowCrashReport) {
+					loggerConfig.autoNotify = false;
+					loggerConfig.registerBeforeSendCallback(() => false);
+					analytics().setAnalyticsCollectionEnabled(false);
+				}
+			});
+	}
+
 	render() {
 		return (
 			<Provider store={store}>

diff --git a/app/lib/methods/getCustomEmojis.js b/app/lib/methods/getCustomEmojis.js
@@ -68,7 +68,7 @@ export default function() {
 										database.delete(emojiRecord);
 									}
 								} catch (e) {
-									log('err_get_emojis_delete', e);
+									log(e);
 								}
 							});
 						}
@@ -77,7 +77,7 @@ export default function() {
 				);
 			}
 		} catch (e) {
-			log('err_get_custom_emojis', e);
+			log(e);
 			return resolve();
 		}
 	});

diff --git a/app/lib/methods/getPermissions.js b/app/lib/methods/getPermissions.js
@@ -16,7 +16,7 @@ const create = (permissions) => {
 			try {
 				database.create('permissions', permission, true);
 			} catch (e) {
-				log('err_get_permissions_create', e);
+				log(e);
 			}
 		});
 	}
@@ -65,7 +65,7 @@ export default function() {
 										database.delete(permission);
 									}
 								} catch (e) {
-									log('err_get_permissions_delete', e);
+									log(e);
 								}
 							});
 						}
@@ -74,7 +74,7 @@ export default function() {
 				);
 			}
 		} catch (e) {
-			log('err_get_permissions', e);
+			log(e);
 			return resolve();
 		}
 	});

diff --git a/app/lib/methods/getRoles.js b/app/lib/methods/getRoles.js
@@ -21,14 +21,14 @@ export default function() {
 						try {
 							database.create('roles', role, true);
 						} catch (e) {
-							log('err_get_roles_create', e);
+							log(e);
 						}
 					}));
 					return resolve();
 				});
 			}
 		} catch (e) {
-			log('err_get_roles', e);
+			log(e);
 			return resolve();
 		}
 	});