Fix for setCrashlyticsCollectionEnabled, cleanup.

Author: Paul Weber

publish/scripts/installer.js

@@ -946,21 +946,21 @@ var fs = require("fs");
 module.exports = function($logger, $projectData) {
 
     return new Promise(function(resolve, reject) {
-        $logger.info("Configure firebase xxx");
+        $logger.info("Configure firebase");
         let projectBuildGradlePath = path.join($projectData.platformsDir, "android", "build.gradle");
         if (fs.existsSync(projectBuildGradlePath)) {
             let buildGradleContent = fs.readFileSync(projectBuildGradlePath).toString();
 
             if (buildGradleContent.indexOf(" google()\\n") === -1) {
-              $logger.info("got no google");
                 let repositoriesNode = buildGradleContent.indexOf("repositories", 0);
                 if (repositoriesNode > -1) {
-                  $logger.info("adding google");
                     repositoriesNode = buildGradleContent.indexOf("}", repositoriesNode);
-                    buildGradleContent = buildGradleContent.substr(0, repositoriesNode - 1) + '\\t\\tgoogle()\\n\\t\\tmaven { url "https://dl.bintray.com/android/android-tools" }\\n' + buildGradleContent.substr(repositoriesNode - 1);
+                    buildGradleContent = buildGradleContent.substr(0, repositoriesNode - 1) + '\\t\\tgoogle()\\n' + buildGradleContent.substr(repositoriesNode - 1);
                 }
 
-            } else if (buildGradleContent.indexOf("https://dl.bintray.com/android/android-tools") === -1) {
+            }
+            
+            if (buildGradleContent.indexOf("https://dl.bintray.com/android/android-tools") === -1) {
                 let repositoriesNode = buildGradleContent.indexOf("repositories", 0);
                 if (repositoriesNode > -1) {
                     repositoriesNode = buildGradleContent.indexOf("}", repositoriesNode);
@@ -972,7 +972,6 @@ module.exports = function($logger, $projectData) {
               let dependenciesNode = buildGradleContent.indexOf("dependencies", 0);
               if (dependenciesNode > -1) {
                   dependenciesNode = buildGradleContent.indexOf("}", dependenciesNode);
-                  // see https://docs.fabric.io/android/changelog.html
                   buildGradleContent = buildGradleContent.substr(0, dependenciesNode - 1) + '	    classpath "com.google.firebase:firebase-crashlytics-gradle:2.3.0"\\n' + buildGradleContent.substr(dependenciesNode - 1);
               }
             }

src/crashlytics/crashlytics.android.ts

@@ -1,7 +1,6 @@
 import { ENABLE_CRASHLYTICS_HINT } from "./crashlytics-common";
 import * as appModule from 'tns-core-modules/application';
 
-
 declare const com: any;
 
 export function sendCrashLog(exception: any /* java.lang.Exception */): void {
@@ -64,11 +63,7 @@ export function crash(): void {
 }
 
 export function setCrashlyticsCollectionEnabled(enabled: boolean): void {
-  // if (isCrashlyticsAvailable()) {
-  //   io.fabric.sdk.android.Fabric.with(
-  //       appModule.getNativeApplication(),
-  //       [new com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance()()]);
-  // }
+  com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(new java.lang.Boolean(enabled));
 }
 
 function isCrashlyticsAvailable(): boolean {

src/firebase.android.ts

@@ -306,13 +306,6 @@ firebase.init = arg => {
         ).setAnalyticsCollectionEnabled(arg.analyticsCollectionEnabled !== false);
       }
 
-      // note that this only makes sense if crash reporting was disabled in AndroidManifest.xml
-      // if (arg.crashlyticsCollectionEnabled && typeof (com.crashlytics) !== "undefined" && typeof (com.google.firebase.crashlytics.FirebaseCrashlytics) !== "undefined") {
-      //   io.fabric.sdk.android.Fabric.with(
-      //       appModule.android.context || appModule.getNativeApplication(),
-      //       [new com.google.firebase.crashlytics.FirebaseCrashlytics.getInstance()]);
-      // }
-
       if (typeof (com.google.firebase.database) !== "undefined" && typeof (com.google.firebase.database.ServerValue) !== "undefined") {
         firebase.ServerValue = {
           TIMESTAMP: firebase.toJsObject(com.google.firebase.database.ServerValue.TIMESTAMP)