Merge pull request #49 from dapetcu21/master

Fix bundling for Android 12 SDK

.github/workflows/bob.yml

@@ -0,0 +1,76 @@
+name: Build with bob
+
+on:
+  push:
+  pull_request_target:
+  schedule:
+    # nightly at 05:00 on the 1st and 15th
+    - cron: 0 5 1,15 * *
+
+env:
+  VERSION_FILENAME: 'info.json'
+  BUILD_SERVER: 'https://build.defold.com'
+
+jobs:
+  build_with_bob:
+    strategy:
+      matrix:
+        platform: [armv7-android, x86_64-linux, x86_64-win32, x86-win32, js-web]
+    runs-on: ubuntu-latest
+
+    name: Build
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.2'
+
+      - name: Get Defold version
+        run: |
+          TMPVAR=`curl -s http://d.defold.com/stable/${{env.VERSION_FILENAME}} | jq -r '.sha1'`
+          echo "DEFOLD_VERSION=${TMPVAR}" >> $GITHUB_ENV
+          echo "Found version ${TMPVAR}"
+
+      - name: Download bob.jar
+        run: |
+          wget -q http://d.defold.com/archive/stable/${{env.DEFOLD_VERSION}}/bob/bob.jar
+          java -jar bob.jar --version
+
+      - name: Resolve libraries
+        run: java -jar bob.jar resolve --email a@b.com --auth 123456
+      - name: Build
+        run: java -jar bob.jar --platform=${{ matrix.platform }} build --archive --build-server=${{env.BUILD_SERVER}}
+      - name: Bundle
+        run: java -jar bob.jar --platform=${{ matrix.platform }} bundle
+
+  # macOS is not technically needed for building, but we want to test bundling as well, since we're also testing the manifest merging
+  build_with_bob_macos:
+    strategy:
+      matrix:
+        platform: [armv7-darwin, x86_64-darwin]
+    runs-on: macOS-latest
+
+    name: Build
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.2'
+
+      - name: Get Defold version
+        run: |
+          TMPVAR=`curl -s http://d.defold.com/stable/${{env.VERSION_FILENAME}} | jq -r '.sha1'`
+          echo "DEFOLD_VERSION=${TMPVAR}" >> $GITHUB_ENV
+          echo "Found version ${TMPVAR}"
+
+      - name: Download bob.jar
+        run: |
+          wget -q http://d.defold.com/archive/stable/${{env.DEFOLD_VERSION}}/bob/bob.jar
+          java -jar bob.jar --version
+
+      - name: Resolve libraries
+        run: java -jar bob.jar resolve --email a@b.com --auth 123456
+      - name: Build
+        run: java -jar bob.jar --platform=${{ matrix.platform }} build --archive --build-server=${{env.BUILD_SERVER}}
+      - name: Bundle
+        run: java -jar bob.jar --platform=${{ matrix.platform }} bundle

README.md

@@ -1,3 +1,5 @@
+[![Actions Status Alpha](https://github.com/defold/extension-iap/actions/workflows/bob.yml/badge.svg)](https://github.com/defold/extension-iap/actions)
+
 # In-app purchase extension for Defold
 
 Defold [native extension](https://www.defold.com/manuals/extensions/) which provides access to In-app purchase functionality on iOS, Android (Google Play and Amazon) and Facebook Canvas platforms.

extension-iap/api/iap.script_api

@@ -226,6 +226,10 @@
           type: string
           desc: Apple only[icon:apple]. The original transaction. This field is only set when `state` is `TRANS_STATE_RESTORED`.
 
+        - name: original_json
+          type: string
+          desc: Android only[icon:android]. The purchase order details in JSON format.
+
         - name: signature
           type: string
           desc: Google Play only[icon:googleplay]. A string containing the signature of the purchase data that was signed with the private key of the developer.

extension-iap/manifests/android/AndroidManifest.xml

@@ -4,9 +4,9 @@
 <uses-sdk android:minSdkVersion="{{android.minimum_sdk_version}}" android:targetSdkVersion="{{android.target_sdk_version}}" />
     <application>
         <!-- For Amazon IAP -->
-        <receiver android:name="com.amazon.device.iap.ResponseReceiver" >
+        <receiver android:exported="true" android:name="com.amazon.device.iap.ResponseReceiver" android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY">
             <intent-filter>
-                <action android:name="com.amazon.inapp.purchasing.NOTIFY" android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY" />
+                <action android:name="com.amazon.inapp.purchasing.NOTIFY" />
             </intent-filter>
         </receiver>
     </application>

extension-iap/src/iap_android.cpp

@@ -1,7 +1,8 @@
 #if defined(DM_PLATFORM_ANDROID)
 
 #include <dmsdk/sdk.h>
-#include <jni.h>
+#include <dmsdk/dlib/android.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include "iap.h"
@@ -9,19 +10,6 @@
 
 #define LIB_NAME "iap"
 
-static JNIEnv* Attach()
-{
-    JNIEnv* env;
-    dmGraphics::GetNativeAndroidJavaVM()->AttachCurrentThread(&env, NULL);
-    return env;
-}
-
-static void Detach()
-{
-    dmGraphics::GetNativeAndroidJavaVM()->DetachCurrentThread();
-}
-
-
 struct IAP
 {
     IAP()
@@ -30,7 +18,6 @@ struct IAP
         m_autoFinishTransactions = true;
         m_ProviderId = PROVIDER_ID_GOOGLE;
     }
-    int             m_InitCount;
     bool            m_autoFinishTransactions;
     int             m_ProviderId;
 
@@ -53,9 +40,9 @@ static IAP g_IAP;
 
 static int IAP_ProcessPendingTransactions(lua_State* L)
 {
-    JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_ProcessPendingConsumables, g_IAP.m_IAPJNI);
-    Detach();
 
     return 0;
 }
@@ -70,7 +57,8 @@ static int IAP_List(lua_State* L)
         return 0;
     }
 
-    JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     IAPCommand* cmd = new IAPCommand;
     cmd->m_Callback = dmScript::CreateCallback(L, 2);
     cmd->m_Command = IAP_PRODUCT_RESULT;
@@ -78,7 +66,6 @@ static int IAP_List(lua_State* L)
     jstring products = env->NewStringUTF(buf);
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_List, products, g_IAP.m_IAPJNI, (jlong)cmd);
     env->DeleteLocalRef(products);
-    Detach();
 
     free(buf);
     assert(top == lua_gettop(L));
@@ -91,11 +78,11 @@ static int IAP_Buy(lua_State* L)
 
     const char* id = luaL_checkstring(L, 1);
 
-    JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     jstring ids = env->NewStringUTF(id);
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Buy, ids, g_IAP.m_IAPJNI);
     env->DeleteLocalRef(ids);
-    Detach();
 
     assert(top == lua_gettop(L));
     return 0;
@@ -136,11 +123,11 @@ static int IAP_Finish(lua_State* L)
         const char * receipt = lua_tostring(L, -1);
         lua_pop(L, 1);
 
-        JNIEnv* env = Attach();
+        dmAndroid::ThreadAttacher threadAttacher;
+        JNIEnv* env = threadAttacher.GetEnv();
         jstring receiptUTF = env->NewStringUTF(receipt);
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_FinishTransaction, receiptUTF, g_IAP.m_IAPJNI);
         env->DeleteLocalRef(receiptUTF);
-        Detach();
     }
 
     assert(top == lua_gettop(L));
@@ -176,11 +163,11 @@ static int IAP_Acknowledge(lua_State* L)
         const char * receipt = lua_tostring(L, -1);
         lua_pop(L, 1);
 
-        JNIEnv* env = Attach();
+        dmAndroid::ThreadAttacher threadAttacher;
+        JNIEnv* env = threadAttacher.GetEnv();
         jstring receiptUTF = env->NewStringUTF(receipt);
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_AcknowledgeTransaction, receiptUTF, g_IAP.m_IAPJNI);
         env->DeleteLocalRef(receiptUTF);
-        Detach();
     }
 
     assert(top == lua_gettop(L));
@@ -193,9 +180,9 @@ static int IAP_Restore(lua_State* L)
     // See iap_ios.mm
 
     int top = lua_gettop(L);
-    JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Restore, g_IAP.m_IAPJNI);
-    Detach();
 
     assert(top == lua_gettop(L));
 
@@ -216,9 +203,9 @@ static int IAP_SetListener(lua_State* L)
 
     // On first set listener, trigger process old ones.
     if (!had_previous) {
-        JNIEnv* env = Attach();
+        dmAndroid::ThreadAttacher threadAttacher;
+        JNIEnv* env = threadAttacher.GetEnv();
         env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_ProcessPendingConsumables, g_IAP.m_IAPJNI);
-        Detach();
     }
     return 0;
 }
@@ -399,20 +386,12 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
 
 static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
-    // TODO: Life-cycle managaemnt is *budget*. No notion of "static initalization"
-    // Extend extension functionality with per system initalization?
-    if (g_IAP.m_InitCount == 0) {
     IAP_Queue_Create(&g_IAP.m_CommandQueue);
 
     g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
 
-        JNIEnv* env = Attach();
-
-        jclass activity_class = env->FindClass("android/app/NativeActivity");
-        jmethodID get_class_loader = env->GetMethodID(activity_class,"getClassLoader", "()Ljava/lang/ClassLoader;");
-        jobject cls = env->CallObjectMethod(dmGraphics::GetNativeAndroidActivity(), get_class_loader);
-        jclass class_loader = env->FindClass("java/lang/ClassLoader");
-        jmethodID find_class = env->GetMethodID(class_loader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+    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";
@@ -426,14 +405,8 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
         dmLogWarning("Unknown IAP provider name [%s], defaulting to GooglePlay", provider);
     }
 
-        jstring str_class_name = env->NewStringUTF(class_name);
-
-        jclass iap_class = (jclass)env->CallObjectMethod(cls, find_class, str_class_name);
-        env->DeleteLocalRef(str_class_name);
-
-        str_class_name = env->NewStringUTF("com.defold.iap.IapJNI");
-        jclass iap_jni_class = (jclass)env->CallObjectMethod(cls, find_class, str_class_name);
-        env->DeleteLocalRef(str_class_name);
+    jclass iap_class = dmAndroid::LoadClass(env, class_name);
+    jclass iap_jni_class = dmAndroid::LoadClass(env, "com.defold.iap.IapJNI");
 
     g_IAP.m_List = env->GetMethodID(iap_class, "listItems", "(Ljava/lang/String;Lcom/defold/iap/IListProductsListener;J)V");
     g_IAP.m_Buy = env->GetMethodID(iap_class, "buy", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
@@ -444,15 +417,11 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
     g_IAP.m_AcknowledgeTransaction = env->GetMethodID(iap_class, "acknowledgeTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
 
     jmethodID jni_constructor = env->GetMethodID(iap_class, "<init>", "(Landroid/app/Activity;Z)V");
-        g_IAP.m_IAP = env->NewGlobalRef(env->NewObject(iap_class, jni_constructor, dmGraphics::GetNativeAndroidActivity(), g_IAP.m_autoFinishTransactions));
+    g_IAP.m_IAP = env->NewGlobalRef(env->NewObject(iap_class, jni_constructor, threadAttacher.GetActivity()->clazz, g_IAP.m_autoFinishTransactions));
 
     jni_constructor = env->GetMethodID(iap_jni_class, "<init>", "()V");
     g_IAP.m_IAPJNI = env->NewGlobalRef(env->NewObject(iap_jni_class, jni_constructor));
 
-        Detach();
-    }
-    g_IAP.m_InitCount++;
-
     lua_State*L = params->m_L;
     int top = lua_gettop(L);
     luaL_register(L, LIB_NAME, IAP_methods);
@@ -494,21 +463,18 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
-    --g_IAP.m_InitCount;
 
     if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
         dmScript::DestroyCallback(g_IAP.m_Listener);
         g_IAP.m_Listener = 0;
     }
 
-    if (g_IAP.m_InitCount == 0) {
-        JNIEnv* env = Attach();
+    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = threadAttacher.GetEnv();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Stop);
     env->DeleteGlobalRef(g_IAP.m_IAP);
     env->DeleteGlobalRef(g_IAP.m_IAPJNI);
-        Detach();
     g_IAP.m_IAP = NULL;
-    }
     return dmExtension::RESULT_OK;
 }
 

extension-iap/src/iap_ios.mm

@@ -24,7 +24,7 @@ struct IAP
         memset(this, 0, sizeof(*this));
         m_AutoFinishTransactions = true;
     }
-    int                             m_InitCount;
+    int                             m_Version;
     bool                            m_AutoFinishTransactions;
     NSMutableDictionary*            m_PendingTransactions;
     dmScript::LuaCallbackInfo*      m_Listener;
@@ -103,11 +103,17 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 @interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate>
     @property dmScript::LuaCallbackInfo* m_Callback;
     @property (assign) SKProductsRequest* m_Request;
+    @property int m_Version;
 @end
 
 @implementation SKProductsRequestDelegate
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response{
 
+    if (self.m_Version != g_IAP.m_Version) {
+        dmLogWarning("Received products but the extension has been restarted")
+        return;
+    }
+
     if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
@@ -162,7 +168,7 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPResponse* response = (IAPResponse*)cmd->m_Data;
 
-    lua_State* L = dmScript::GetCallbackLuaContext(g_IAP.m_Listener);
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
     if (!dmScript::SetupCallback(cmd->m_Callback))
@@ -409,6 +415,7 @@ static int IAP_List(lua_State* L)
 
     delegate.m_Callback = dmScript::CreateCallback(L, 2);
     delegate.m_Request = products_request;
+    delegate.m_Version = g_IAP.m_Version;
     products_request.delegate = delegate;
     [products_request start];
 
@@ -529,13 +536,9 @@ static const luaL_reg IAP_methods[] =
 
 static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
-    // TODO: Life-cycle managaemnt is *budget*. No notion of "static initalization"
-    // Extend extension functionality with per system initalization?
-    if (g_IAP.m_InitCount == 0) {
     g_IAP.m_AutoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
     g_IAP.m_PendingTransactions = [[NSMutableDictionary alloc]initWithCapacity:2];
-    }
-    g_IAP.m_InitCount++;
+    g_IAP.m_Version++;
 
     IAP_Queue_Create(&g_IAP.m_CommandQueue);
     IAP_Queue_Create(&g_IAP.m_ObservableQueue);
@@ -590,16 +593,13 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 
 static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
-    --g_IAP.m_InitCount;
-
-    // TODO: Should we support one listener per lua-state?
-    // Or just use a single lua-state...?
-    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
+    if (g_IAP.m_Listener)
+    {
         dmScript::DestroyCallback(g_IAP.m_Listener);
-        g_IAP.m_Listener = 0;
     }
 
-    if (g_IAP.m_InitCount == 0) {
+    g_IAP.m_Listener = 0;
+
     if (g_IAP.m_PendingTransactions) {
          [g_IAP.m_PendingTransactions release];
          g_IAP.m_PendingTransactions = 0;
@@ -610,7 +610,6 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
         [g_IAP.m_Observer release];
         g_IAP.m_Observer = 0;
     }
-    }
 
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
     IAP_Queue_Destroy(&g_IAP.m_ObservableQueue);

extension-iap/src/iap_private.cpp

@@ -121,18 +121,22 @@ void IAP_Queue_Push(IAPCommandQueue* queue, IAPCommand* cmd)
 void IAP_Queue_Flush(IAPCommandQueue* queue, IAPCommandFn fn, void* ctx)
 {
     assert(fn != 0);
+
     if (queue->m_Commands.Empty())
     {
         return;
     }
 
-    DM_MUTEX_SCOPED_LOCK(queue->m_Mutex);
-
-    for(uint32_t i = 0; i != queue->m_Commands.Size(); ++i)
+    dmArray<IAPCommand> tmp;
     {
-        fn(&queue->m_Commands[i], ctx);
+        DM_MUTEX_SCOPED_LOCK(queue->m_Mutex);
+        tmp.Swap(queue->m_Commands);
+    }
+
+    for(uint32_t i = 0; i != tmp.Size(); ++i)
+    {
+        fn(&tmp[i], ctx);
     }
-    queue->m_Commands.SetSize(0);
 }
 
 #endif // DM_PLATFORM_HTML5 || DM_PLATFORM_ANDROID || DM_PLATFORM_IOS

extension-iap/src/java/com/defold/iap/IapAmazon.java

@@ -11,6 +11,7 @@ import java.util.concurrent.BlockingQueue;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONArray;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -173,9 +174,13 @@ public class IapAmazon implements PurchasingListener {
         if (productDataResponse.getRequestStatus() != ProductDataResponse.RequestStatus.SUCCESSFUL) {
             listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null, commadPtr);
         } else {
+            for (final String s : productDataResponse.getUnavailableSkus()) {
+                Log.v(TAG, "Unavailable SKU: " + s);
+            }
+
             Map<String, Product> products = productDataResponse.getProductData();
             try {
-                JSONObject data = new JSONObject();
+                JSONArray data = new JSONArray();
                 for (Map.Entry<String, Product> entry : products.entrySet()) {
                     String key = entry.getKey();
                     Product product = entry.getValue();
@@ -189,7 +194,7 @@ public class IapAmazon implements PurchasingListener {
                         // Based on return values from getPrice: https://developer.amazon.com/public/binaries/content/assets/javadoc/in-app-purchasing-api/com/amazon/inapp/purchasing/item.html
                         item.put("price", priceString.replaceAll("[^0-9.,]", ""));
                     }
-                    data.put(key, item);
+                    data.put(item);
                 }
                 listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_OK, data.toString(), commadPtr);
             } catch (JSONException e) {

extension-iap/src/java/com/defold/iap/IapGooglePlay.java

@@ -102,6 +102,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
             p.put("date", toISO8601(new Date(purchase.getPurchaseTime())));
             p.put("receipt", purchase.getPurchaseToken());
             p.put("signature", purchase.getSignature());
+            p.put("original_json", purchase.getOriginalJson());
         }
         catch (JSONException e) {
             Log.wtf(TAG, "Failed to convert purchase", e);