Merge pull request #79 from amirisback/develop/fixing-bug-ump

DEVEOP :: Fixing Bug UMP on release production
amirisback · Jun 20, 2023 · f1cfef4 · f1cfef4
2 parents ddfeed1 + 59c3a06
commit f1cfef4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 24 deletions.
diff --git a/.github/workflows/android-ci-generated-artifact.yml b/.github/workflows/android-ci-generated-artifact.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       # Set Current Date As Env Variable
       - name: Set current date as env variable
@@ -29,9 +29,11 @@ jobs:
         run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
 
       - name: Set Up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       # Set Current Date As Env Variable
       - name: Set current date as env variable
@@ -32,11 +32,13 @@ jobs:
       # Set Repository Name As Env Variable
       - name: Set repository name as env variable
         run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
-      
+
       - name: Set Up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew

diff --git a/README.md b/README.md
@@ -21,13 +21,17 @@
 - Green : Success / Pass (Use It)
 
 ## ScreenShot Apps
-|                      Banner and Interstitial                       |                      RecyclerView with Banner                      |                           Rewarded Apps                            |
-|:------------------------------------------------------------------:|:------------------------------------------------------------------:|:------------------------------------------------------------------:|
-| <img width="200px" height="360px" src="docs/image/ss_image_1.png"> | <img width="200px" height="360px" src="docs/image/ss_image_2.png"> | <img width="200px" height="360px" src="docs/image/ss_image_3.png"> |
+|                      Banner and Interstitial                       |                      RecyclerView with Banner                      |
+|:------------------------------------------------------------------:|:------------------------------------------------------------------:|
+| <img width="200px" height="360px" src="docs/image/ss_image_1.png"> | <img width="200px" height="360px" src="docs/image/ss_image_2.png"> |
+
+|                    User Messaging Platform                     |                           Rewarded Apps                            |
+|:--------------------------------------------------------------:|:------------------------------------------------------------------:|
+| <img width="200px" height="360px" src="docs/image/ss-ump.jpg"> | <img width="200px" height="360px" src="docs/image/ss_image_3.png"> |
 
 ## Version Release
 
-    $version_release = 5.3.0
+    $version_release = 5.3.1
 
     // Suport Library
     $admob_version = 22.1.0 // https://developers.google.com/admob/android/sdk
@@ -79,16 +83,16 @@ allprojects {
         implementation 'com.unity3d.ads:unity-ads:${unity_ad_version}'
 
         // library frogo-admob (Required - Recomended)
-        implementation 'com.github.amirisback:frogo-admob:5.3.0'
+        implementation 'com.github.amirisback:frogo-admob:5.3.1'
 
         // -----------------------------------------------------------------------------------------
         // For Single Library Patch 
 
         // library frogo-admob (Admob Only)
-        implementation 'com.github.amirisback.frogo-admob:ad-admob:5.3.0'
+        implementation 'com.github.amirisback.frogo-admob:ad-admob:5.3.1'
 
         // library frogo-admob (Unity Ads Only)
-        implementation 'com.github.amirisback.frogo-admob:ad-unityad:5.3.0'
+        implementation 'com.github.amirisback.frogo-admob:ad-unityad:5.3.1'
 	}
 
 #### <Option 2> Kotlin DSL
@@ -101,16 +105,16 @@ allprojects {
         implementation("com.unity3d.ads:unity-ads:${unity_ad_version}")
 
         // library frogo-admob (Required - Recomended)
-        implementation("com.github.amirisback:frogo-admob:5.3.0")
+        implementation("com.github.amirisback:frogo-admob:5.3.1")
 
         // -----------------------------------------------------------------------------------------
         // For Single Library Patch
 
         // library frogo-admob (Admob Only)
-        implementation("com.github.amirisback.frogo-admob:ad-admob:5.3.0")
+        implementation("com.github.amirisback.frogo-admob:ad-admob:5.3.1")
 
         // library frogo-admob (Unity Ads Only)
-        implementation("com.github.amirisback.frogo-admob:ad-unityad:5.3.0")
+        implementation("com.github.amirisback.frogo-admob:ad-unityad:5.3.1")
 
 	}
 

diff --git a/ad-admob/src/main/java/com/frogobox/admob/core/FrogoAdConsent.kt b/ad-admob/src/main/java/com/frogobox/admob/core/FrogoAdConsent.kt
@@ -24,19 +24,22 @@ object FrogoAdConsent {
 
     fun showConsent(callback: IFrogoAdConsent) {
 
-        val consentInformation: ConsentInformation =
-            UserMessagingPlatform.getConsentInformation(callback.activity())
-
-        val debugSettings = ConsentDebugSettings.Builder(callback.activity())
-            .setDebugGeography(ConsentDebugSettings.DebugGeography.DEBUG_GEOGRAPHY_EEA)
-            .addTestDeviceHashedId("TEST-DEVICE-HASHED-ID").setForceTesting(true).build()
+        val consentInformation: ConsentInformation = UserMessagingPlatform.getConsentInformation(callback.activity())
 
         // Set tag for underage of consent. false means users are not underage.
         val params = if (callback.isDebug()) {
+
+            val debugSettings = ConsentDebugSettings.Builder(callback.activity())
+                .setDebugGeography(ConsentDebugSettings.DebugGeography.DEBUG_GEOGRAPHY_EEA)
+                .addTestDeviceHashedId("TEST-DEVICE-HASHED-ID")
+                .setForceTesting(true)
+                .build()
+
             ConsentRequestParameters.Builder()
                 .setTagForUnderAgeOfConsent(callback.isUnderAgeAd())
                 .setConsentDebugSettings(debugSettings)
                 .build()
+
         } else {
             ConsentRequestParameters.Builder()
                 .setTagForUnderAgeOfConsent(callback.isUnderAgeAd())

diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -25,7 +25,7 @@ object ProjectSetting {
 
     const val VERSION_MAJOR = 5
     const val VERSION_MINOR = 3
-    const val VERSION_PATCH = 0
+    const val VERSION_PATCH = 1
 
     // ---------------------------------------------------------------------------------------------
 

diff --git a/docs/image/ss-ump.jpg b/docs/image/ss-ump.jpg