Not able to add screen logs in Firebase Analytics on android device after upgrading to version from 9.1.1 to 10.0.0 #1415

Author: EddyVerbruggen

demo-ng/package.json

@@ -25,7 +25,7 @@
     "nativescript-angular": "~8.0.3",
     "nativescript-camera": "~4.5.0",
     "nativescript-imagepicker": "~6.2.0",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.0.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "reflect-metadata": "~0.1.13",
     "rxjs": "~6.5.2",

demo-push/app/push-view-model.ts

@@ -1,8 +1,9 @@
+import * as firebase from "nativescript-plugin-firebase";
+import { Message, messaging } from "nativescript-plugin-firebase/messaging";
+import * as applicationSettings from "tns-core-modules/application-settings";
 import { Observable } from "tns-core-modules/data/observable";
-import { messaging, Message } from "nativescript-plugin-firebase/messaging";
-import { alert, confirm } from "tns-core-modules/ui/dialogs";
 import * as platform from "tns-core-modules/platform";
-import * as applicationSettings from "tns-core-modules/application-settings";
+import { alert, confirm } from "tns-core-modules/ui/dialogs";
 
 const getCircularReplacer = () => {
   const seen = new WeakSet;
@@ -26,6 +27,7 @@ export class PushViewModel extends Observable {
     if (applicationSettings.getBoolean(PushViewModel.APP_REGISTERED_FOR_NOTIFICATIONS, false)) {
       this.doRegisterPushHandlers();
     }
+    this.setScreenName("push-demo-view");
   }
 
   public doRequestConsent(): void {
@@ -241,4 +243,13 @@ export class PushViewModel extends Observable {
       okButtonText: "Okay, very interesting"
     });
   }
+
+  private setScreenName(screenName): void {
+    firebase.analytics.setScreenName(
+        {
+          screenName
+        })
+        .then(() => console.log("Analytics screen name set to: " + screenName))
+        .catch(err => console.log("Analytics error: " + err));
+  }
 }

demo-push/package.json

@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.0.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "nativescript-unit-test-runner": "0.7.0",
     "tns-core-modules": "~6.1.1"

demo-vue/package.json

@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.0.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.0.tgz",
     "nativescript-theme-core": "~1.0.6",
     "nativescript-vue": "~2.4.0",
     "tns-core-modules": "~6.1.1"

demo/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "firebase-functions": "^2.0.5",
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.0.2.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.1.0.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
     "tns-core-modules": "~6.1.1"

publish/scripts/installer.js

@@ -3,7 +3,7 @@ var path = require('path');
 var prompt = require('prompt-lite');
 
 // Default settings for a few prompts
-var usingiOS = false, usingAndroid = false, externalPushClientOnly = false;
+var usingiOS = false, usingAndroid = false, externalPushClient = false;
 
 // The directories where the Podfile and include.gradle are stored
 var directories = {
@@ -22,6 +22,8 @@ function mergeConfig(result) {
   for (var key in result) {
     config[key] = isSelected(result[key]);
   }
+  // note that the semantics of "external_push_client_only" changed to "external push client" with plugin version 10.1.0
+  externalPushClient = isSelected(config["external_push_client_only"]);
 }
 
 function saveConfig() {
@@ -48,32 +50,13 @@ if (process.argv.indexOf("config") === -1 && fs.existsSync(pluginConfigPath)) {
   console.log("Config file exists (" + pluginConfigFile + ")");
   askiOSPromptResult(config);
   askAndroidPromptResult(config);
-  askExternalPushMessagingOnlyPromptResult(config);
   promptQuestionsResult(config);
 } else if (!isInteractive()) {
   console.log("No existing " + pluginConfigFile + " config file found and terminal is not interactive! Default configuration will be used.");
 } else {
   console.log("No existing " + pluginConfigFile + " config file found, so let's configure the Firebase plugin!");
   prompt.start();
-  askExternalPushMessagingOnlyPrompt();
-}
-
-/**
- * Prompt the user if they are integrating Firebase with iOS
- */
-function askExternalPushMessagingOnlyPrompt() {
-  prompt.get({
-    name: 'external_push_client_only',
-    description: 'Are you using this plugin ONLY as a Push Notification client for an external (non-Firebase) Push service? (y/n)',
-    default: 'n'
-  }, function (err, result) {
-    if (err) {
-      return console.log(err);
-    }
-    mergeConfig(result);
-    askExternalPushMessagingOnlyPromptResult(result);
-    askiOSPrompt();
-  });
+  askiOSPrompt();
 }
 
 /**
@@ -94,12 +77,6 @@ function askiOSPrompt() {
   });
 }
 
-function askExternalPushMessagingOnlyPromptResult(result) {
-  if (isSelected(result.external_push_client_only)) {
-    externalPushClientOnly = true;
-  }
-}
-
 function askiOSPromptResult(result) {
   if (isSelected(result.using_ios)) {
     usingiOS = true;
@@ -120,11 +97,8 @@ function askAndroidPrompt() {
     }
     mergeConfig(result);
     askAndroidPromptResult(result);
-    if ((usingiOS || usingAndroid) && !externalPushClientOnly) {
+    if (usingiOS || usingAndroid) {
       promptQuestions();
-    } else if (externalPushClientOnly) {
-      promptQuestionsResult(result);
-      askSaveConfigPrompt();
     } else {
       askSaveConfigPrompt();
     }
@@ -165,6 +139,10 @@ function promptQuestions() {
     name: 'performance_monitoring',
     description: 'Are you using Performance Monitoring? (y/n)',
     default: 'n'
+  }, {
+    name: 'external_push_client_only',
+    description: 'Are you using this plugin as a Push Notification client for an external (NOT Firebase Cloud Messaging) Push service? (y/n)',
+    default: 'n'
   }, {
     name: 'messaging',
     description: 'Are you using Firebase Cloud Messaging? (y/n)',
@@ -267,9 +245,7 @@ function promptQuestions() {
 
 function promptQuestionsResult(result) {
   if (usingiOS) {
-    if (!externalPushClientOnly) {
-      writePodFile(result);
-    }
+    writePodFile(result);
     writeGoogleServiceCopyHook();
     writeBuildscriptHookForCrashlytics(isSelected(result.crashlytics));
     writeBuildscriptHookForFirestore(isSelected(result.firestore));
@@ -280,7 +256,7 @@ function promptQuestionsResult(result) {
     writeGoogleServiceCopyHook();
     writeGoogleServiceGradleHook(result);
     echoAndroidManifestChanges(result);
-    activateAndroidPushNotificationsLib(isSelected(result.messaging) || externalPushClientOnly);
+    activateAndroidPushNotificationsLib(isSelected(result.messaging) || isSelected(result.external_push_client_only));
     activateAndroidMLKitCustomModelLib(isSelected(result.ml_kit) && isSelected(result.ml_kit_custom_model));
   }
 
@@ -359,13 +335,13 @@ function writePodFile(result) {
 (isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
 
 # Analytics
-` + (!externalPushClientOnly && (!isPresent(result.analytics) || isSelected(result.analytics)) ? `` : `#`) + `pod 'Firebase/Analytics'
+` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `#`) + `pod 'Firebase/Analytics'
 
 # Authentication
-` + (!isPresent(result.authentication) || isSelected(result.authentication) ? `` : `#`) + `pod 'Firebase/Auth'
+` + (isSelected(result.authentication) || (!isSelected(result.external_push_client_only) && !isPresent(result.external_push_client_only)) ? `` : `#`) + `pod 'Firebase/Auth'
 
 # Realtime DB
-` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `#`) + `pod 'Firebase/Database'
+` + (isSelected(result.realtimedb) || (!isSelected(result.external_push_client_only) && !isPresent(result.realtimedb)) ? `` : `#`) + `pod 'Firebase/Database'
 
 # Cloud Firestore
 ` + (isSelected(result.firestore) ? `` : `#`) + `pod 'Firebase/Firestore'
@@ -391,7 +367,7 @@ post_install do |installer|
 end`) + `
 
 # Firebase Cloud Messaging (FCM)
-` + (isSelected(result.messaging) && !isSelected(result.external_messaging) ? `` : `#`) + `pod 'Firebase/Messaging'
+` + (isSelected(result.messaging) ? `` : `#`) + `pod 'Firebase/Messaging'
 
 # Firebase In-App Messaging
 ` + (isSelected(result.in_app_messaging) ? `` : `#`) + `pod 'Firebase/InAppMessagingDisplay'
@@ -730,16 +706,16 @@ dependencies {
 
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
 
-    ` + (!externalPushClientOnly && (!isPresent(result.analytics) || isSelected(result.analytics)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-analytics:17.2.0"
+    ` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-analytics:17.2.0"
 
     // for reading google-services.json and configuration
     implementation "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Authentication
-    ` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:19.0.0"
+    ` + (isSelected(result.authentication) || (!isSelected(result.external_push_client_only) && !isPresent(result.authentication)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-auth:19.0.0"
 
     // Realtime DB
-    ` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:19.1.0"
+    ` + (isSelected(result.realtimedb) || (!isSelected(result.external_push_client_only) && !isPresent(result.realtimedb)) ? `` : `//`) + ` implementation "com.google.firebase:firebase-database:19.1.0"
 
     // Cloud Firestore
     ` + (isSelected(result.firestore) ? `` : `//`) + ` implementation "com.google.firebase:firebase-firestore:21.1.1"
@@ -754,8 +730,8 @@ dependencies {
     ` + (isSelected(result.crashlytics) ? `` : `//`) + ` implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     // Cloud Messaging (FCM)
-    ` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:20.0.0"
-    // ` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` implementation "me.leolin:ShortcutBadger:1.1.22@aar"
+    ` + (isSelected(result.messaging) || isSelected(result.external_push_client_only) ? `` : `//`) + ` implementation "com.google.firebase:firebase-messaging:20.0.0"
+    // ` + (isSelected(result.messaging) || isSelected(result.external_push_client_only) ? `` : `//`) + ` implementation "me.leolin:ShortcutBadger:1.1.22@aar"
 
     // In-App Messaging
     ` + (isSelected(result.in_app_messaging) ? `` : `//`) + ` implementation "com.google.firebase:firebase-inappmessaging-display:19.0.0"
@@ -1000,9 +976,9 @@ var copyPlist = function(copyPlistOpts) {
                 return true;
             }
         } else if (!fs.existsSync(destinationGooglePlist)) { // single GoogleService-Info.plist modus but missing`;
-    if (externalPushClientOnly) {
+    if (externalPushClient) {
       beforeCheckForChangesContent += `
-            return true; // this is a push-only project, so this is allowed`;
+            return true; // this may be a push-only project, so this is allowed`;
     } else {
       beforeCheckForChangesContent += `
             copyPlistOpts.$logger.warn("nativescript-plugin-firebase: " + destinationGooglePlist + " does not exist. Please follow the installation instructions from the documentation");

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "10.0.2",
+  "version": "10.1.0",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",