UPDATE flutter-hms-adsprime 13.4.55+301

Author: ozkulbeng

flutter-hms-adsprime/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 13.4.55+301
+
+- Fixed an issue when destroying NativeAd.
+- Fixed an issue that caused RewardAd listeners to not work properly.
+- Fixed an issue that caused InterstitialAd listeners to not work properly.
+- Fixed an issue that caused some device information to be processed without user agreement.
+
 ## 13.4.55+300
 
 - Initial release.

flutter-hms-adsprime/android/src/main/java/com/huawei/hms/flutter/ads/HmsAdsPlugin.java

@@ -27,7 +27,6 @@
 import com.huawei.hms.ads.BannerAdSize;
 import com.huawei.hms.ads.HwAds;
 import com.huawei.hms.ads.RequestOptions;
-import com.huawei.hms.ads.consent.inter.Consent;
 import com.huawei.hms.ads.identifier.AdIdVerifyException;
 import com.huawei.hms.ads.identifier.AdvertisingIdClient;
 import com.huawei.hms.flutter.ads.adslite.banner.Banner;
@@ -80,7 +79,6 @@ public class HmsAdsPlugin implements FlutterPlugin, ActivityAware, MethodCallHan
     private MethodChannel methodChannel;
     private BinaryMessenger messenger;
     private FlutterPluginBinding flutterPluginBinding;
-    private Consent consentInfo;
 
     private EventChannel consentEventChannel;
     private MethodChannel splashMethodChannel;
@@ -127,10 +125,10 @@ private void attachedToActivity(@NonNull ActivityPluginBinding binding) {
 
             this.activity = binding.getActivity();
             this.context = flutterPluginBinding.getApplicationContext();
-            this.methodChannel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), Channels.LIBRARY_METHOD_CHANNEL);
             this.messenger = flutterPluginBinding.getBinaryMessenger();
+            this.methodChannel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), Channels.LIBRARY_METHOD_CHANNEL);
             this.methodChannel.setMethodCallHandler(this);
-            this.consentInfo = Consent.getInstance(binding.getActivity());
+
             initAdChannels(flutterPluginBinding.getBinaryMessenger());
             initAdHandlers();
             setAdHandlers();
@@ -145,7 +143,6 @@ public void onDetachedFromActivityForConfigChanges() {
         HmsRewardAd.destroyAll();
         HmsInstallReferrer.disposeAll();
         activity = null;
-        consentInfo = null;
         resetAdHandlers();
         removeAdHandlers();
         removeAdChannels();
@@ -158,7 +155,6 @@ public void onDetachedFromActivity() {
         Banner.destroyAll();
         HmsRewardAd.destroyAll();
         HmsInstallReferrer.disposeAll();
-        consentInfo = null;
         activity = null;
         resetAdHandlers();
         removeAdHandlers();
@@ -176,7 +172,6 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
         methodChannel = null;
         messenger = null;
         activity = null;
-        consentInfo = null;
         resetAdHandlers();
         removeAdHandlers();
         removeAdChannels();
@@ -202,8 +197,8 @@ private void initAdHandlers() {
         instreamMethodHandler = new InstreamMethodHandler(messenger, context);
         vastMethodHandler = new VastMethodHandler(context);
         installReferrerMethodHandler = new InstallReferrerMethodHandler(activity, referrerMethodChannel);
-        consentMethodHandler = new ConsentMethodHandler(context, consentInfo);
-        consentStreamHandler = new ConsentStreamHandler(consentInfo, context);
+        consentMethodHandler = new ConsentMethodHandler(context);
+        consentStreamHandler = new ConsentStreamHandler(context);
     }
 
     private void setAdHandlers() {

flutter-hms-adsprime/android/src/main/java/com/huawei/hms/flutter/ads/adslite/interstitial/InterstitialMethodHandler.java

@@ -90,9 +90,9 @@ private void initInterstitialAd(MethodCall call, Result result) {
 
         EventChannelFactory.create(rId, Channels.REWARD_EVENT_CHANNEL, messenger);
         EventChannelFactory.setup(rId, new RewardStreamHandler(context));
-
-        new Interstitial(id, openInHmsCore, activity, context);
         result.success(true);
+        
+        new Interstitial(id, openInHmsCore, activity, context);
         HMSLogger.getInstance(context).sendSingleEvent("initInterstitialAd");
     }
 

flutter-hms-adsprime/android/src/main/java/com/huawei/hms/flutter/ads/adslite/nativead/NativeAdControllerFactory.java

@@ -20,6 +20,7 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.huawei.hms.ads.nativead.NativeAd;
 import com.huawei.hms.flutter.ads.utils.constants.Channels;
 
 import io.flutter.plugin.common.BinaryMessenger;
@@ -49,9 +50,12 @@ public static NativeAdController get(Integer id) {
     }
 
     public static boolean dispose(int id) {
-        NativeAdController controller = allControllers.get(id);
+        final NativeAdController controller = allControllers.get(id);
         if (controller != null) {
-            controller.getNativeAd().destroy();
+            final NativeAd nativeAd = controller.getNativeAd();
+            if (nativeAd != null) {
+                nativeAd.destroy();
+            }
             allControllers.remove(id);
             return true;
         }

flutter-hms-adsprime/android/src/main/java/com/huawei/hms/flutter/ads/adslite/reward/RewardMethodHandler.java

@@ -93,6 +93,7 @@ private void initRewardAd(MethodCall call, Result result) {
 
         EventChannelFactory.create(id, Channels.REWARD_EVENT_CHANNEL, messenger);
         EventChannelFactory.setup(id, new RewardStreamHandler(context));
+        result.success(true);
 
         new HmsRewardAd(id, openInHmsCore, activity, context);
         HMSLogger.getInstance(context).sendSingleEvent("initRewardAd");

flutter-hms-adsprime/android/src/main/java/com/huawei/hms/flutter/ads/consent/ConsentMethodHandler.java

@@ -38,11 +38,9 @@
 public class ConsentMethodHandler implements MethodChannel.MethodCallHandler {
     private static final String TAG = "ConsentMethodHandler";
     private final Context context;
-    private Consent consentInfo;
 
-    public ConsentMethodHandler(final Context context, final Consent consentInfo) {
+    public ConsentMethodHandler(final Context context) {
         this.context = context;
-        this.consentInfo = consentInfo;
     }
 
     @Override
@@ -77,28 +75,21 @@ public void onMethodCall(@NonNull final MethodCall call, @NonNull final Result r
 
     private void getTestDeviceId(Result result) {
         HMSLogger.getInstance(context).startMethodExecutionTimer("getTestDeviceId");
-        if (consentInfo != null) {
-            result.success(consentInfo.getTestDeviceId());
-            HMSLogger.getInstance(context).sendSingleEvent("getTestDeviceId");
-        } else {
-            result.error(ErrorCodes.INNER, "Consent instance is null. getTestDeviceId failed.", "");
-            HMSLogger.getInstance(context).sendSingleEvent("getTestDeviceId", ErrorCodes.INNER);
-        }
+        result.success(Consent.getInstance(context).getTestDeviceId());
+        HMSLogger.getInstance(context).sendSingleEvent("getTestDeviceId");
     }
 
     private void addTestDeviceId(MethodCall call, MethodChannel.Result result) {
         HMSLogger.getInstance(context).startMethodExecutionTimer("addTestDeviceId");
         String deviceId = FromMap.toString("deviceId", call.argument("deviceId"));
-        if (deviceId != null && consentInfo != null) {
+        if (deviceId != null) {
             Log.i(TAG, "SDK addTestDeviceId begin");
-            consentInfo.addTestDeviceId(deviceId);
+            Consent.getInstance(context).addTestDeviceId(deviceId);
             Log.i(TAG, "SDK addTestDeviceId end");
             result.success(true);
             HMSLogger.getInstance(context).sendSingleEvent("addTestDeviceId");
         } else {
-            result.error(ErrorCodes.NULL_PARAM,
-                "Test deviceId is null? : " + (deviceId == null) + ". | Consent initialized? : " + (consentInfo != null) + ". addTestDevice failed.",
-                "");
+            result.error(ErrorCodes.NULL_PARAM, "Test deviceId is null? : true. addTestDevice failed.", "");
             HMSLogger.getInstance(context).sendSingleEvent("addTestDeviceId", ErrorCodes.NULL_PARAM);
         }
     }
@@ -109,7 +100,7 @@ private void setDebugNeedConsent(MethodCall call, MethodChannel.Result result) {
         if (consentStr != null) {
             DebugNeedConsent needConsent = DebugNeedConsent.valueOf(consentStr);
             Log.i(TAG, "SDK setDebugNeedConsent begin");
-            consentInfo.setDebugNeedConsent(needConsent);
+            Consent.getInstance(context).setDebugNeedConsent(needConsent);
             Log.i(TAG, "SDK setDebugNeedConsent end");
             result.success(true);
             HMSLogger.getInstance(context).sendSingleEvent("setDebugNeedConsent");
@@ -124,7 +115,7 @@ private void setDebugNeedConsent(MethodCall call, MethodChannel.Result result) {
     private void setUnderAgeOfPromise(MethodCall call, MethodChannel.Result result) {
         HMSLogger.getInstance(context).startMethodExecutionTimer("setUnderAgeOfPromise");
         Boolean ageOfPromise = FromMap.toBoolean("ageOfPromise", call.argument("ageOfPromise"));
-        consentInfo.setUnderAgeOfPromise(ageOfPromise);
+        Consent.getInstance(context).setUnderAgeOfPromise(ageOfPromise);
         result.success(true);
         HMSLogger.getInstance(context).sendSingleEvent("setUnderAgeOfPromise");
     }
@@ -135,7 +126,7 @@ private void setConsentStatus(MethodCall call, MethodChannel.Result result) {
         if (status != null) {
             ConsentStatus consentStatus = ConsentStatus.valueOf(status);
             Log.i(TAG, "setConsentStatus begin");
-            consentInfo.setConsentStatus(consentStatus);
+            Consent.getInstance(context).setConsentStatus(consentStatus);
             Log.i(TAG, "setConsentStatus end");
             result.success(true);
             HMSLogger.getInstance(context).sendSingleEvent("setConsentStatus");

flutter-hms-adsprime/android/src/main/java/com/huawei/hms/flutter/ads/consent/ConsentStreamHandler.java

@@ -32,17 +32,15 @@
 
 public class ConsentStreamHandler implements EventChannel.StreamHandler {
     private static final String TAG = "ConsentStreamHandler";
-    private final Consent consentInfo;
     private final Context context;
 
-    public ConsentStreamHandler(final Consent consentInfo, Context context) {
-        this.consentInfo = consentInfo;
+    public ConsentStreamHandler(Context context) {
         this.context = context;
     }
 
     @Override
     public void onListen(Object args, final EventChannel.EventSink event) {
-        consentInfo.requestConsentUpdate(new ConsentUpdateListenerImpl(context, event));
+        Consent.getInstance(context).requestConsentUpdate(new ConsentUpdateListenerImpl(context, event));
     }
 
     @Override

flutter-hms-adsprime/example/lib/pages/ads_menu_page.dart

@@ -45,11 +45,14 @@ class AdsMenuPage extends StatelessWidget {
               style: Styles.menuButtonStyle,
             ),
             onPressed: () {
-              Navigator.push(context, MaterialPageRoute<dynamic>(
-                builder: (BuildContext context) {
-                  return const PublisherPage();
-                },
-              ));
+              Navigator.push(
+                context,
+                MaterialPageRoute<dynamic>(
+                  builder: (BuildContext context) {
+                    return const PublisherPage();
+                  },
+                ),
+              );
             },
           ),
           ElevatedButton(
@@ -58,11 +61,14 @@ class AdsMenuPage extends StatelessWidget {
               style: Styles.menuButtonStyle,
             ),
             onPressed: () {
-              Navigator.push(context, MaterialPageRoute<dynamic>(
-                builder: (BuildContext context) {
-                  return const OaidPage();
-                },
-              ));
+              Navigator.push(
+                context,
+                MaterialPageRoute<dynamic>(
+                  builder: (BuildContext context) {
+                    return const OaidPage();
+                  },
+                ),
+              );
             },
           ),
           ElevatedButton(
@@ -71,11 +77,14 @@ class AdsMenuPage extends StatelessWidget {
               style: Styles.menuButtonStyle,
             ),
             onPressed: () {
-              Navigator.push(context, MaterialPageRoute<dynamic>(
-                builder: (BuildContext context) {
-                  return const InstallReferrerPage();
-                },
-              ));
+              Navigator.push(
+                context,
+                MaterialPageRoute<dynamic>(
+                  builder: (BuildContext context) {
+                    return const InstallReferrerPage();
+                  },
+                ),
+              );
             },
           ),
           ElevatedButton(
@@ -84,11 +93,14 @@ class AdsMenuPage extends StatelessWidget {
               style: Styles.menuButtonStyle,
             ),
             onPressed: () {
-              Navigator.push(context, MaterialPageRoute<dynamic>(
-                builder: (BuildContext context) {
-                  return const VastAdPage();
-                },
-              ));
+              Navigator.push(
+                context,
+                MaterialPageRoute<dynamic>(
+                  builder: (BuildContext context) {
+                    return const VastAdPage();
+                  },
+                ),
+              );
             },
           ),
         ],

flutter-hms-adsprime/example/lib/pages/identifier/oaid_page.dart

@@ -22,7 +22,7 @@ class OaidPage extends StatefulWidget {
   const OaidPage({Key? key}) : super(key: key);
 
   @override
-  _OaidPageState createState() => _OaidPageState();
+  State<OaidPage> createState() => _OaidPageState();
 }
 
 class _OaidPageState extends State<OaidPage> {
@@ -44,7 +44,9 @@ class _OaidPageState extends State<OaidPage> {
 
   void testVerifyAdId() async {
     bool? isVerified = await AdvertisingIdClient.verifyAdId(
-        _oaid!, _client!.isLimitAdTrackingEnabled!);
+      _oaid!,
+      _client!.isLimitAdTrackingEnabled!,
+    );
     setState(() {
       _verified = isVerified;
     });
@@ -70,32 +72,24 @@ class _OaidPageState extends State<OaidPage> {
             crossAxisAlignment: CrossAxisAlignment.center,
             children: <Widget>[
               const Text('OAID', style: Styles.headerTextStyle),
-              const SizedBox(
-                height: 10,
-              ),
+              const SizedBox(height: 10),
               Text(
                 '$_oaid',
                 style: Styles.textContentStyle,
               ),
-              const SizedBox(
-                height: 30,
-              ),
-              const Text('Limit Ad Tracking Enabled',
-                  style: Styles.headerTextStyle),
-              const SizedBox(
-                height: 10,
+              const SizedBox(height: 30),
+              const Text(
+                'Limit Ad Tracking Enabled',
+                style: Styles.headerTextStyle,
               ),
+              const SizedBox(height: 10),
               Text(
                 '${_limitAdTracking ?? ''}',
                 style: Styles.textContentStyle,
               ),
-              const SizedBox(
-                height: 30,
-              ),
+              const SizedBox(height: 30),
               const Text('Verify Ad Id', style: Styles.headerTextStyle),
-              const SizedBox(
-                height: 10,
-              ),
+              const SizedBox(height: 10),
               Text(
                 '${_verified ?? 'This method takes a long time. You may need to wait a while to see the verification result.'}',
                 style: _verified != null