Merge pull request #45 from googleads/1.0.4

Changed logic for re-consent prompts. Updated to 1.0.4

Author: jweisbaum

PersonalizedAdConsent/PersonalizedAdConsent/Info.plist

@@ -29,7 +29,7 @@ @interface PACAdProvider ()
 - (nullable instancetype)initWithDictionary:(nullable NSDictionary<NSString *, id> *)dictionary;
 @end
 
-NSString *const PACVersionString = @"1.0.3";
+NSString *const PACVersionString = @"1.0.4";
 NSString *const PACUserDefaultsRootKey = @"personalized_ad_status";
 
 static NSString *const PACInfoUpdateURLFormat =
@@ -80,8 +80,8 @@ static PACConsentStatus PACConsentStatusForStatusString(NSString *_Nullable stat
 }
 
 /// Returns an array of ad provider dictionary representations for the provided ad providers.
-static NSArray<NSDictionary *> *_Nonnull
-PACSerializeAdProviders(NSOrderedSet<PACAdProvider *> *_Nullable providers) {
+static NSArray<NSDictionary *> *_Nonnull PACSerializeAdProviders(
+    NSOrderedSet<PACAdProvider *> *_Nullable providers) {
   NSMutableArray<NSDictionary *> *serializedProviders = [[NSMutableArray alloc] init];
   for (PACAdProvider *provider in providers) {
     [serializedProviders addObject:provider.dictionaryRepresentation];
@@ -91,8 +91,8 @@ static PACConsentStatus PACConsentStatusForStatusString(NSString *_Nullable stat
 
 /// Returns an ordered set of ad providers for the provided array of ad provider dictionary
 /// representations.
-static NSOrderedSet<PACAdProvider *> *_Nonnull
-PACDeserializeAdProviders(NSArray<NSDictionary *> *_Nullable serializedProviders) {
+static NSOrderedSet<PACAdProvider *> *_Nonnull PACDeserializeAdProviders(
+    NSArray<NSDictionary *> *_Nullable serializedProviders) {
   NSMutableOrderedSet *adProviders = [[NSMutableOrderedSet alloc] init];
   for (NSDictionary<NSString *, id> *providerInfo in serializedProviders) {
     PACAdProvider *provider = [[PACAdProvider alloc] initWithDictionary:providerInfo];
@@ -122,15 +122,15 @@ - (nullable instancetype)initWithDictionary:(nullable NSDictionary<NSString *, i
 }
 
 - (NSUInteger)hash {
-  return _dictionaryRepresentation.hash;
+  return _identifier.hash;
 }
 
 - (BOOL)isEqual:(nullable id)object {
   if (![object isKindOfClass:[PACAdProvider class]]) {
     return NO;
   }
   PACAdProvider *other = object;
-  return [_dictionaryRepresentation isEqual:other.dictionaryRepresentation];
+  return [self.identifier isEqual:other.identifier];
 }
 
 @end
@@ -244,7 +244,7 @@ - (void)writeStatusToUserDefaults {
     PACStoreKeyTaggedForUnderAgeOfConsent : _tagForUnderAgeOfConsent ? @1 : @0,
     PACStoreKeyIsRequestInEEAOrUnknown : _isRequestInEEAOrUnknown ? @1 : @0,
     PACStoreKeyHasAnyNonPersonalizedPublisherIdentifier :
-        _hasAnyNonPersonalizedPublisherIdentifier ? @1 : @0,
+            _hasAnyNonPersonalizedPublisherIdentifier ? @1 : @0,
     PACStoreKeyConsentStatus : PACConsentStatusStringForStatus(_status),
     PACStoreKeyPublisherIdentifiers : _publisherIdentifiers.allObjects ?: @[],
     PACStoreKeyProviders : PACSerializeAdProviders(_adProviders),
@@ -330,8 +330,9 @@ - (void)requestConsentInfoUpdateForPublisherIdentifiers:
                  return;
                }
 
-               NSDictionary<NSString *, id> *info =
-                   [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+               NSDictionary<NSString *, id> *info = [NSJSONSerialization JSONObjectWithData:data
+                                                                                    options:0
+                                                                                      error:&error];
                if (error || ![info isKindOfClass:[NSDictionary class]]) {
                  if (!error) {
                    error = PACErrorWithDescription(@"Invalid response.");
@@ -340,8 +341,8 @@ - (void)requestConsentInfoUpdateForPublisherIdentifiers:
                  return;
                }
 
-               NSString *responseString =
-                   [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+               NSString *responseString = [[NSString alloc] initWithData:data
+                                                                encoding:NSUTF8StringEncoding];
 
                dispatch_async(dispatch_get_main_queue(), ^{
                  [self handleInfoUpdateResponse:publisherIdentifiers
@@ -464,9 +465,10 @@ - (void)handleInfoUpdateResponse:(nonnull NSArray<NSString *> *)publisherIdentif
 
   BOOL nonPersonalizedOnlyValueChanged =
       _hasAnyNonPersonalizedPublisherIdentifier != previousHasAnyNonPersonalizedPublisherIdentifier;
-  BOOL providersMatchesConsentedProviders = [_consentedProviders.set isEqual:_adProviders.set];
+  BOOL consentedProvidersContainsProviders =
+      [_adProviders.set isSubsetOfSet:_consentedProviders.set];
   if (_isRequestInEEAOrUnknown &&
-      (!providersMatchesConsentedProviders || nonPersonalizedOnlyValueChanged)) {
+      (!consentedProvidersContainsProviders || nonPersonalizedOnlyValueChanged)) {
     _consentedProviders = nil;
     _status = PACConsentStatusUnknown;
   }

PersonalizedAdConsent/PersonalizedAdConsent/PACConsentForm.h

@@ -17,14 +17,14 @@
 #import "PACConsentForm.h"
 
 typedef NSString *PACFormKey NS_STRING_ENUM;
-static PACFormKey const PACFormKeyOfferPersonalized = @"offer_personalized";
-static PACFormKey const PACFormKeyOfferNonPersonalized = @"offer_non_personalized";
-static PACFormKey const PACFormKeyOfferAdFree = @"offer_ad_free";
-static PACFormKey const PACFormKeyAppPrivacyPolicyURLString = @"app_privacy_url";
-static PACFormKey const PACFormKeyConstentInfo = @"consent_info";
-static PACFormKey const PACFormKeyAppName = @"app_name";
-static PACFormKey const PACFormKeyAppIcon = @"app_icon";
-static PACFormKey const PACFormKeyPlatform = @"plat";
+static PACFormKey _Nonnull const PACFormKeyOfferPersonalized = @"offer_personalized";
+static PACFormKey _Nonnull const PACFormKeyOfferNonPersonalized = @"offer_non_personalized";
+static PACFormKey _Nonnull const PACFormKeyOfferAdFree = @"offer_ad_free";
+static PACFormKey _Nonnull const PACFormKeyAppPrivacyPolicyURLString = @"app_privacy_url";
+static PACFormKey _Nonnull const PACFormKeyConstentInfo = @"consent_info";
+static PACFormKey _Nonnull const PACFormKeyAppName = @"app_name";
+static PACFormKey _Nonnull const PACFormKeyAppIcon = @"app_icon";
+static PACFormKey _Nonnull const PACFormKeyPlatform = @"plat";
 
 /// Loads and displays the consent form.
 @interface PACView : UIView<UIWebViewDelegate>