react-native-google-mobile-ads 11.6.0 → 11.6.1

package/README.md

@@ -50,19 +50,12 @@ When using The New Architecture, some legacy code will still be used though. See
 - [Installation](https://docs.page/invertase/react-native-google-mobile-ads)
 - [Displaying Ads](https://docs.page/invertase/react-native-google-mobile-ads/displaying-ads)
 
-<!--
-- [Quick Start](https://rnfirebase.io/)
-- [Reference API](https://rnfirebase.io/reference) -->
-
 ## Contributing
 
-<!-- - [Overview](https://rnfirebase.io) -->
-
 - [Issues](https://github.com/invertase/react-native-google-mobile-ads/issues)
 - [PRs](https://github.com/invertase/react-native-google-mobile-ads/pulls)
-<!-- - [Documentation](https://rnfirebase.io) -->
-- [Community](https://github.com/invertase/react-native-google-mobile-ads/blob/master/CONTRIBUTING.md)
-- [Code of Conduct](https://github.com/invertase/meta/blob/master/CODE_OF_CONDUCT.md)
+- [Guidelines](https://github.com/invertase/react-native-google-mobile-ads/blob/main/CONTRIBUTING.md)
+- [Code of Conduct](https://github.com/invertase/meta/blob/main/CODE_OF_CONDUCT.md)
 
 ## License
 

package/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsConsentModule.java

@@ -16,6 +16,7 @@ package io.invertase.googlemobileads;
  * limitations under the License.
  *
  */
+import android.app.Activity;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import com.facebook.react.bridge.Arguments;
@@ -96,7 +97,9 @@ public class ReactNativeGoogleMobileAdsConsentModule extends ReactNativeModule {
 
       ConsentRequestParameters consentRequestParameters = paramsBuilder.build();
 
-      if (getCurrentActivity() == null) {
+      Activity currentActivity = getCurrentActivity();
+
+      if (currentActivity == null) {
         rejectPromiseWithCodeAndMessage(
             promise,
             "null-activity",
@@ -105,7 +108,7 @@ public class ReactNativeGoogleMobileAdsConsentModule extends ReactNativeModule {
       }
 
       consentInformation.requestConsentInfoUpdate(
-          getCurrentActivity(),
+          currentActivity,
           consentRequestParameters,
           () -> {
             WritableMap requestInfoMap = Arguments.createMap();
@@ -131,37 +134,38 @@ public class ReactNativeGoogleMobileAdsConsentModule extends ReactNativeModule {
   @ReactMethod
   public void showForm(final Promise promise) {
     try {
-      if (getCurrentActivity() == null) {
+      Activity currentActivity = getCurrentActivity();
+
+      if (currentActivity == null) {
         rejectPromiseWithCodeAndMessage(
             promise,
             "null-activity",
             "Consent form attempted to show but the current Activity was null.");
         return;
       }
-      getCurrentActivity()
-          .runOnUiThread(
-              () ->
-                  UserMessagingPlatform.loadConsentForm(
-                      getReactApplicationContext(),
-                      consentForm ->
-                          consentForm.show(
-                              getCurrentActivity(),
-                              formError -> {
-                                if (formError != null) {
-                                  rejectPromiseWithCodeAndMessage(
-                                      promise, "consent-form-error", formError.getMessage());
-                                } else {
-                                  WritableMap consentFormMap = Arguments.createMap();
-                                  consentFormMap.putString(
-                                      "status",
-                                      getConsentStatusString(
-                                          consentInformation.getConsentStatus()));
-                                  promise.resolve(consentFormMap);
-                                }
-                              }),
-                      formError ->
-                          rejectPromiseWithCodeAndMessage(
-                              promise, "consent-form-error", formError.getMessage())));
+
+      currentActivity.runOnUiThread(
+          () ->
+              UserMessagingPlatform.loadConsentForm(
+                  getReactApplicationContext(),
+                  consentForm ->
+                      consentForm.show(
+                          currentActivity,
+                          formError -> {
+                            if (formError != null) {
+                              rejectPromiseWithCodeAndMessage(
+                                  promise, "consent-form-error", formError.getMessage());
+                            } else {
+                              WritableMap consentFormMap = Arguments.createMap();
+                              consentFormMap.putString(
+                                  "status",
+                                  getConsentStatusString(consentInformation.getConsentStatus()));
+                              promise.resolve(consentFormMap);
+                            }
+                          }),
+                  formError ->
+                      rejectPromiseWithCodeAndMessage(
+                          promise, "consent-form-error", formError.getMessage())));
     } catch (Exception e) {
       rejectPromiseWithCodeAndMessage(promise, "consent-form-error", e.toString());
     }
@@ -170,26 +174,28 @@ public class ReactNativeGoogleMobileAdsConsentModule extends ReactNativeModule {
   @ReactMethod
   public void showPrivacyOptionsForm(final Promise promise) {
     try {
-      if (getCurrentActivity() == null) {
+      Activity currentActivity = getCurrentActivity();
+
+      if (currentActivity == null) {
         rejectPromiseWithCodeAndMessage(
             promise,
             "null-activity",
             "Privacy options form attempted to show but the current Activity was null.");
         return;
       }
-      getCurrentActivity()
-          .runOnUiThread(
-              () ->
-                  UserMessagingPlatform.showPrivacyOptionsForm(
-                      getCurrentActivity(),
-                      formError -> {
-                        if (formError != null) {
-                          rejectPromiseWithCodeAndMessage(
-                              promise, "privacy-options-form-error", formError.getMessage());
-                        } else {
-                          promise.resolve("Privacy options form presented successfully.");
-                        }
-                      }));
+
+      currentActivity.runOnUiThread(
+          () ->
+              UserMessagingPlatform.showPrivacyOptionsForm(
+                  currentActivity,
+                  formError -> {
+                    if (formError != null) {
+                      rejectPromiseWithCodeAndMessage(
+                          promise, "privacy-options-form-error", formError.getMessage());
+                    } else {
+                      promise.resolve("Privacy options form presented successfully.");
+                    }
+                  }));
     } catch (Exception e) {
       rejectPromiseWithCodeAndMessage(promise, "consent-form-error", e.toString());
     }

package/lib/commonjs/version.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = void 0;
 // Generated by genversion.
-const version = '11.6.0';
+const version = '11.6.1';
 exports.version = version;
 //# sourceMappingURL=version.js.map

package/lib/module/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '11.6.0';
+export const version = '11.6.1';
 //# sourceMappingURL=version.js.map

package/lib/typescript/index.d.ts

@@ -1,4 +1,4 @@
-export declare const SDK_VERSION = "11.6.0";
+export declare const SDK_VERSION = "11.6.1";
 export { default, MobileAds } from './MobileAds';
 export { AdsConsentDebugGeography } from './AdsConsentDebugGeography';
 export { AdsConsentPurposes } from './AdsConsentPurposes';

package/lib/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "11.6.0";
+export declare const version = "11.6.1";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-mobile-ads",
-  "version": "11.6.0",
+  "version": "11.6.1",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Google Mobile Ads is an easy way to monetize mobile apps with targeted, in-app advertising.",
   "main": "lib/commonjs/index.js",

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '11.6.0';
+export const version = '11.6.1';