Merge pull request #85 from prashantsaini1/main

chore(android): upgrade `analytics` to 22.2.0 and `installations` to …

Author: hansemannn

android/build.gradle

@@ -3,6 +3,6 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.google.firebase:firebase-analytics:21.0.0'
-	implementation 'com.google.firebase:firebase-installations:17.0.1'
+	implementation 'com.google.firebase:firebase-analytics:22.2.0'
+	implementation 'com.google.firebase:firebase-installations:18.0.0'
 }

android/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.2.0
+version: 5.3.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-firebase-analytics

android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java

@@ -126,25 +126,21 @@ public void setScreenNameAndScreenClass(KrollDict parameters)
 		final String screenClass = parameters.getString("screenClass");
 		final FirebaseAnalytics instance = analyticsInstance();
 
-		getActivity().runOnUiThread(new Runnable() {
-			@Override
-			public void run()
-			{
-				Bundle bundle = new Bundle(1);
-
-				bundle.putString(FirebaseAnalytics.Param.SCREEN_NAME, screenName);
-				if (screenClass != null) {
-					bundle.putString(FirebaseAnalytics.Param.SCREEN_CLASS, screenClass);
-				}
+		getActivity().runOnUiThread(() -> {
+            Bundle bundle = new Bundle(1);
 
-				instance.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW, bundle);
-			}
-		});
+            bundle.putString(FirebaseAnalytics.Param.SCREEN_NAME, screenName);
+            if (screenClass != null) {
+                bundle.putString(FirebaseAnalytics.Param.SCREEN_CLASS, screenClass);
+            }
+
+            instance.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW, bundle);
+        });
 	}
 
 	private Bundle mapToBundle(Map<String, Object> map)
 	{
-		if (map == null || map.size() == 0)
+		if (map == null || map.isEmpty())
 			return null;
 
 		Bundle bundle = new Bundle(map.size());

android/timodule.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
 	<modules>
-		<!-- Require Firebase Core (https://github.com/hansemannn/titanium-firebase-core) -->
-		<module platform="android">firebase.core</module>
-
 		<!-- Require Ti.PlayServices (https://github.com/appcelerator-modules/ti.playservices) -->
 		<module platform="android">ti.playservices</module>
 	</modules>