Merge pull request 'refactor/extension' (#1) from refactor/extension into master

Reviewed-on: #1

extension-iap/src/iap_android.cpp

@@ -213,9 +213,8 @@ static int IAP_SetListener(lua_State* L)
 
     bool had_previous = iap->m_Listener != 0;
 
-    if (iap->m_Listener) {
+    if (iap->m_Listener)
         dmScript::DestroyCallback(iap->m_Listener);
-    }
 
     iap->m_Listener = dmScript::CreateCallback(L, 1);
 
@@ -224,10 +223,7 @@ static int IAP_SetListener(lua_State* L)
         dmAndroid::ThreadAttacher threadAttacher;
         JNIEnv* env = threadAttacher.GetEnv();
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_ProcessPendingConsumables, g_IAP.m_IAPJNI);
-        dmLogInfo("IAP: Processing pending transactions");
     }
-
-    dmLogInfo("IAP listener set");
     return 0;
 }
 
@@ -352,7 +348,7 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
 
     if (!dmScript::SetupCallback(cmd->m_Callback))
     {
-        dmLogError("Failed to setup callback for purchase result!");
+        dmLogError("Failed to setup callback");
         assert(top == lua_gettop(L));
         return;
     }
@@ -368,7 +364,7 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
             IAP_PushError(L, "purchase response was null", REASON_UNSPECIFIED);
         }
     } else if (cmd->m_ResponseCode == BILLING_RESPONSE_RESULT_USER_CANCELED) {
-        dmLogInfo("User canceled purchase");
+        dmLogError("User canceled purchase");
         lua_pushnil(L);
         IAP_PushError(L, "user canceled purchase", REASON_USER_CANCELED);
     } else {
@@ -389,7 +385,9 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
     dmAndroid::ThreadAttacher threadAttacher;
     JNIEnv* env = threadAttacher.GetEnv();
 
+    const char* provider = dmConfigFile::GetString(params->m_ConfigFile, "android.iap_provider", "GooglePlay");
     const char* class_name = "com.defold.iap.IapGooglePlay";
+
     jclass iap_class = dmAndroid::LoadClass(env, class_name);
     jclass iap_jni_class = dmAndroid::LoadClass(env, "com.defold.iap.IapJNI");
 
@@ -424,16 +422,15 @@ static void IAP_OnCommand(IAPCommand* cmd, void*)
 {
     switch (cmd->m_Command)
     {
-        case IAP_PRODUCT_RESULT:
-            HandleProductResult(cmd);
-            break;
-            
-        case IAP_PURCHASE_RESULT:
-            HandlePurchaseResult(cmd);
-            break;
+    case IAP_PRODUCT_RESULT:
+        HandleProductResult(cmd);
+        break;
+    case IAP_PURCHASE_RESULT:
+        HandlePurchaseResult(cmd);
+        break;
 
-        default:
-            assert(false);
+    default:
+        assert(false);
     }
 
     if (cmd->m_Data) {

extension-iap/src/iap_ios.mm

@@ -325,7 +325,6 @@ static void HandlePurchaseResult(IAPCommand* cmd)
 
     if (!dmScript::SetupCallback(cmd->m_Callback))
     {
-        dmLogError("Failed to setup callback for purchase result");
         assert(top == lua_gettop(L));
         return;
     }

extension-iap/src/iap_null.cpp

@@ -1,4 +1,4 @@
-#if !defined(DM_PLATFORM_ANDROID) && !defined(DM_PLATFORM_IOS)
+#if !defined(DM_PLATFORM_HTML5) && !defined(DM_PLATFORM_ANDROID) && !defined(DM_PLATFORM_IOS)
 
 extern "C" void IAPExt()
 {

extension-iap/src/iap_private.cpp

@@ -1,4 +1,4 @@
-#if defined(DM_PLATFORM_ANDROID) || defined(DM_PLATFORM_IOS)
+#if defined(DM_PLATFORM_HTML5) || defined(DM_PLATFORM_ANDROID) || defined(DM_PLATFORM_IOS)
 
 #include <dmsdk/sdk.h>
 

extension-iap/src/iap_private.h

@@ -1,4 +1,4 @@
-#if defined(DM_PLATFORM_ANDROID) || defined(DM_PLATFORM_IOS)
+#if defined(DM_PLATFORM_HTML5) || defined(DM_PLATFORM_ANDROID) || defined(DM_PLATFORM_IOS)
 
 #ifndef IAP_PRIVATE_H
 #define IAP_PRIVATE_H