Updated docs

Author: britzl

docs/index.md

@@ -27,8 +27,25 @@ Follow the [main setup guide for integration of Firebase in Defold](https://www.
 ```lua
 function init(self)
 	-- use firebase only if it is supported on the current platform
-	if firebase then
-		firebase.init()
+    if not firebase then
+        return
+    end
+
+	-- initialise firebase and check that it was successful
+    local ok, err = firebase.init()
+    if not ok then
+        print(err)
+        return
+    end
+
+	-- initialise analytics
+	firebase.analytics.init(function(self, ok, err)
+		if not ok then
+			print(err)
+			return
+		end
+
+		-- log data
 		firebase.analytics.set_screen("myscreen", "collection")
 		firebase.analytics.log_string("character", "storm trooper")
 		firebase.analytics.log_int("kills", 152)
@@ -39,7 +56,7 @@ function init(self)
 			string = "some_string"
 		}
 		firebase.analytics.log_table("stats", t)
-	end
+	end)
 end
 ```
 

firebase_analytics/src/firebase_analytics.cpp

@@ -41,41 +41,40 @@ static int FirebaseAnalytics_Analytics_InstanceId(lua_State* L) {
 	DM_LUA_STACK_CHECK(L, 0);
 	g_FirebaseAnalytics_InstanceIdCallback = dmScript::CreateCallback(L, 1);
 
-	Future<std::string> future = analytics::GetAnalyticsInstanceId();
-	future.OnCompletion([](const Future< std::string >& completed_future) {
-			if (!dmScript::IsCallbackValid(g_FirebaseAnalytics_InstanceIdCallback))
-			{
-				dmLogWarning("Analytics InstanceId callback is not valid");
-				return;
-			}
+	analytics::GetAnalyticsInstanceId()
+	.OnCompletion([](const Future< std::string >& completed_future) {
+		if (!dmScript::IsCallbackValid(g_FirebaseAnalytics_InstanceIdCallback))
+		{
+			dmLogWarning("Analytics InstanceId callback is not valid");
+			return;
+		}
 
-			if (dmScript::SetupCallback(g_FirebaseAnalytics_InstanceIdCallback))
-			{
-				lua_State* L = dmScript::GetCallbackLuaContext(g_FirebaseAnalytics_InstanceIdCallback);
+		if (dmScript::SetupCallback(g_FirebaseAnalytics_InstanceIdCallback))
+		{
+			lua_State* L = dmScript::GetCallbackLuaContext(g_FirebaseAnalytics_InstanceIdCallback);
 
-				if (completed_future.error() == 0) {
-					lua_pushstring(L, completed_future.result()->c_str());
-					int ret = lua_pcall(L, 2, 0, 0);
-					if (ret != 0) {
-						lua_pop(L, 1);
-					}
+			if (completed_future.error() == 0) {
+				lua_pushstring(L, completed_future.result()->c_str());
+				int ret = lua_pcall(L, 2, 0, 0);
+				if (ret != 0) {
+					lua_pop(L, 1);
 				}
-				else {
-					dmLogError("%d: %s", completed_future.error(), completed_future.error_message());
-					lua_pushnil(L);
-					lua_pushstring(L, completed_future.error_message());
-					int ret = lua_pcall(L, 3, 0, 0);
-					if (ret != 0) {
-						lua_pop(L, 2);
-					}
+			}
+			else {
+				dmLogError("%d: %s", completed_future.error(), completed_future.error_message());
+				lua_pushnil(L);
+				lua_pushstring(L, completed_future.error_message());
+				int ret = lua_pcall(L, 3, 0, 0);
+				if (ret != 0) {
+					lua_pop(L, 2);
 				}
-				dmScript::TeardownCallback(g_FirebaseAnalytics_InstanceIdCallback);
 			}
+			dmScript::TeardownCallback(g_FirebaseAnalytics_InstanceIdCallback);
+		}
 
-			dmScript::DestroyCallback(g_FirebaseAnalytics_InstanceIdCallback);
-			g_FirebaseAnalytics_InstanceIdCallback = 0;
-
-		});
+		dmScript::DestroyCallback(g_FirebaseAnalytics_InstanceIdCallback);
+		g_FirebaseAnalytics_InstanceIdCallback = 0;
+	});
 	return 0;
 }