Fixing the build

coronalabs · Sep 11, 2021 · 56f98df · 56f98df
1 parent cb4b7f3
commit 56f98df
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 16 deletions.
diff --git a/plugins/2020.3569/android/plugin.notifications.v2.jar b/plugins/2020.3569/android/plugin.notifications.v2.jar
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
@@ -9,6 +9,7 @@ import org.apache.tools.ant.filters.StringInputStream
 
 plugins {
     id("com.android.application")
+    id("com.google.gms.google-services")
 }
 
 //<editor-fold desc="Utility Variables Setup" defaultstate="collapsed">
@@ -1059,6 +1060,7 @@ tasks.register<Zip>("createExpansionFile") {
 //</editor-fold>
 
 dependencies {
+
     if (coronaBuiltFromSource) {
         implementation(project(":Corona"))
         implementation(files("$rootDir/../../plugins/build/licensing-google/android/bin/classes.jar"))

diff --git a/src/android/app/google-services.json b/src/android/app/google-services.json
@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "532108303969",
+    "firebase_url": "https://fir-cloud-messaging-16d9a.firebaseio.com",
+    "project_id": "fir-cloud-messaging-16d9a",
+    "storage_bucket": "fir-cloud-messaging-16d9a.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:532108303969:android:a7f606ca19b0b13b",
+        "android_client_info": {
+          "package_name": "com.coronalabs.firebase.messaging"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "532108303969-6hgarnooc5dclgmb7q9lu4f2k5l6qs9p.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAdBEHHph7nxPlcAtpAkMXhIS5cSpOhcK8"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/.../com/mycompany/app/CoronaApplication.java → ...firebase/messaging/CoronaApplication.java b/.../com/mycompany/app/CoronaApplication.java → ...firebase/messaging/CoronaApplication.java
@@ -5,7 +5,7 @@
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
-package com.mycompany.app;
+package com.coronalabs.firebase.messaging;
 
 /**
  * Extends the Application class to receive Corona runtime events and to extend the Lua API.

diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts
@@ -7,6 +7,7 @@ buildscript {
         classpath(kotlin("gradle-plugin", version = "1.3.70"))
         classpath("com.android.tools.build:gradle:3.5.4")
         classpath("com.beust:klaxon:5.0.1")
+        classpath("com.google.gms:google-services:4.3.10")
     }
 }
 

diff --git a/src/android/plugin/src/main/java/plugin/notifications/v2/LuaLoader.java b/src/android/plugin/src/main/java/plugin/notifications/v2/LuaLoader.java
@@ -7,25 +7,22 @@
 
 package plugin.notifications.v2;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import com.ansca.corona.Bridge;
 import com.ansca.corona.CoronaActivity;
-import com.ansca.corona.CoronaRuntimeTaskDispatcher;
 import com.ansca.corona.CoronaEnvironment;
 import com.ansca.corona.CoronaRuntime;
 import com.ansca.corona.CoronaRuntimeListener;
-import com.ansca.corona.Bridge;
-
-import com.google.android.gms.tasks.Task;
-import com.naef.jnlua.LuaState;
+import com.ansca.corona.CoronaRuntimeTaskDispatcher;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.naef.jnlua.JavaFunction;
+import com.naef.jnlua.LuaState;
 import com.naef.jnlua.LuaType;
 import com.naef.jnlua.NamedJavaFunction;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.util.Log;
-
-import com.google.firebase.messaging.FirebaseMessaging;
-
 /**
  * Implements the Lua interface for the plugin.
  * <p>
@@ -263,12 +260,12 @@ public int invoke(final LuaState luaState) {
                 logMsg(ERROR_MSG, "Expected no arguments, got " + nargs);
                 return 0;
             }
-            Task<String> tokenTask = FirebaseMessaging.getInstance().getToken();
+            String deviceToken = null;
             try {
-                tokenTask.wait(1000);
-            } catch (InterruptedException ignore) {
+                deviceToken = FirebaseMessaging.getInstance().getToken().getResult();
+            } catch (Throwable ex) {
+                ex.printStackTrace();
             }
-            String deviceToken = tokenTask.getResult();
 
             if (deviceToken == null) {
                 deviceToken = "unknown";