Merge pull request #35 from defold/Issue-32-set-request-agent

Set extension version as user agent
defold · Jul 31, 2023 · a33d8a5 · a33d8a5
2 parents ffcebf9 + a7cc8e5
commit a33d8a5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/extension-admob/src/admob.cpp b/extension-admob/src/admob.cpp
@@ -13,10 +13,12 @@
 
 namespace dmAdmob {
 
+static const char DEFOLD_USERAGENT[] = "defold-3.2.0";
+
 static int Lua_Initialize(lua_State* L)
 {
     DM_LUA_STACK_CHECK(L, 0);
-    Initialize();
+    Initialize(DEFOLD_USERAGENT);
     return 0;
 }
 

diff --git a/extension-admob/src/admob_android.cpp b/extension-admob/src/admob_android.cpp
@@ -95,7 +95,7 @@ static void CallVoidMethodBool(jobject instance, jmethodID method, bool cbool)
 
 static void InitJNIMethods(JNIEnv* env, jclass cls)
 {
-    g_admob.m_Initialize = env->GetMethodID(cls, "initialize", "()V");
+    g_admob.m_Initialize = env->GetMethodID(cls, "initialize", "(Ljava/lang/String;)V");
     g_admob.m_LoadInterstitial = env->GetMethodID(cls, "loadInterstitial", "(Ljava/lang/String;)V");
     g_admob.m_ShowInterstitial = env->GetMethodID(cls, "showInterstitial", "()V");
     g_admob.m_LoadRewarded = env->GetMethodID(cls, "loadRewarded", "(Ljava/lang/String;)V");
@@ -128,9 +128,9 @@ void Initialize_Ext()
     g_admob.m_AdmobJNI = env->NewGlobalRef(env->NewObject(cls, jni_constructor, threadAttacher.GetActivity()->clazz));
 }
 
-void Initialize()
+void Initialize(const char* defoldUserAgent)
 {
-    CallVoidMethod(g_admob.m_AdmobJNI, g_admob.m_Initialize);
+    CallVoidMethodChar(g_admob.m_AdmobJNI, g_admob.m_Initialize, defoldUserAgent);
 }
 
 void LoadInterstitial(const char* unitId)

diff --git a/extension-admob/src/admob_ios.mm b/extension-admob/src/admob_ios.mm
@@ -22,6 +22,8 @@ @interface AdmobExtBannerAdDelegate : NSObject<GADBannerViewDelegate>
 
 namespace dmAdmob {
 
+    static const char* m_DefoldUserAgent = nil;
+
     static UIViewController *uiViewController = nil;
 
     void SendSimpleMessage(MessageId msg, id obj) {
@@ -82,13 +84,20 @@ void SendSimpleMessage(MessageId msg, MessageEvent event, NSString *key_2, int v
         SendSimpleMessage(msg, dict);
     }
 
-    void Initialize() {
+    void Initialize(const char* defoldUserAgent) {
+        m_DefoldUserAgent = defoldUserAgent;
         [[GADMobileAds sharedInstance]
         startWithCompletionHandler:^(GADInitializationStatus *_Nonnull status) {
             SendSimpleMessage(MSG_INITIALIZATION, EVENT_COMPLETE);
         }];
     }
 
+    GADRequest* createGADRequest() {
+        GADRequest *request = [GADRequest request];
+        request.requestAgent = [NSString stringWithUTF8String: m_DefoldUserAgent];
+        return request;
+    }
+
 //--------------------------------------------------
 // Interstitial ADS
 
@@ -109,10 +118,9 @@ void SetInterstitialAd(GADInterstitialAd *newAd) {
     }
 
     void LoadInterstitial(const char* unitId) {
-        GADRequest *request = [GADRequest request];
         [GADInterstitialAd
             loadWithAdUnitID:[NSString stringWithUTF8String:unitId]
-            request:request
+            request:createGADRequest()
             completionHandler:^(GADInterstitialAd *ad, NSError *error) {
                 if (error) {
                     SetInterstitialAd(nil);
@@ -169,10 +177,9 @@ void SetRewardedAd(GADRewardedAd *newAd) {
     }
 
     void LoadRewarded(const char* unitId) {
-        GADRequest *request = [GADRequest request];
         [GADRewardedAd
             loadWithAdUnitID:[NSString stringWithUTF8String:unitId]
-            request:request
+            request:createGADRequest()
             completionHandler:^(GADRewardedAd *ad, NSError *error) {
                 if (error) {
                     SetRewardedAd(nil);
@@ -323,7 +330,7 @@ void LoadBanner(const char* unitId, BannerSize bannerSize) {
         bannerAd.rootViewController = uiViewController;
         bannerAd.hidden = YES;
         [uiViewController.view addSubview:bannerAd];
-        [bannerAd loadRequest:[GADRequest request]];
+        [bannerAd loadRequest:createGADRequest()];
     }
 
     void ShowBanner(BannerPosition bannerPos) {

diff --git a/extension-admob/src/admob_private.h b/extension-admob/src/admob_private.h
@@ -44,7 +44,7 @@ enum MaxAdRating
 
 void Initialize_Ext();
 
-void Initialize();
+void Initialize(const char* defoldUserAgent);
 void LoadInterstitial(const char* unitId);
 void ShowInterstitial();
 void LoadRewarded(const char* unitId);

diff --git a/extension-admob/src/java/com/defold/admob/AdmobJNI.java b/extension-admob/src/java/com/defold/admob/AdmobJNI.java
@@ -96,14 +96,17 @@ public class AdmobJNI {
 
   // END CONSTANTS
 
+  private String defoldUserAgent = "defold-x.y.z";
+
 
   private Activity activity;
 
   public AdmobJNI(Activity activity) {
       this.activity = activity;
   }
 
-  public void initialize() {
+  public void initialize(String defoldUserAgent) {
+    this.defoldUserAgent = defoldUserAgent;
       MobileAds.initialize(activity, new OnInitializationCompleteListener() {
           @Override
           public void onInitializationComplete(InitializationStatus initializationStatus) {
@@ -232,6 +235,10 @@ private void sendSimpleMessage(int msg, int eventId, String key_2, int value_2,
     admobAddToQueue(msg, message);
   }
 
+  private AdRequest createAdRequest() {
+    return new AdRequest.Builder().setRequestAgent(defoldUserAgent).build();
+  }
+
 //--------------------------------------------------
 // Interstitial ADS
 
@@ -241,7 +248,7 @@ public void loadInterstitial(final String unitId) {
       activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        AdRequest adRequest = new AdRequest.Builder().build();
+        AdRequest adRequest = createAdRequest();
 
         InterstitialAd.load(activity, unitId, adRequest, new InterstitialAdLoadCallback() {
                 @Override
@@ -330,7 +337,7 @@ public void loadRewarded(final String unitId) {
     activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-        AdRequest adRequest = new AdRequest.Builder().build();
+        AdRequest adRequest = createAdRequest();
 
         RewardedAd.load(activity, unitId,
           adRequest, new RewardedAdLoadCallback(){
@@ -445,7 +452,7 @@ public void loadBanner(final String unitId, int bannerSize) {
     activity.runOnUiThread(new Runnable() {
       @Override
       public void run() {
-          AdRequest adRequest = new AdRequest.Builder().build();
+          AdRequest adRequest = createAdRequest();
           view.setAdListener(new AdListener() {
             @Override
             public void onAdLoaded() {