8.10.1 Version

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 8.10.1
+## Fixed ADID Google play policy changes
+
+* Added ADID Google Play services normal permission.
+
 # 8.10.0
 ## Hosted Auth Support for Progressive Submission
 

app/src/debug/AndroidManifest.xml

@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+
 
     <application
         android:name="com.bazaarvoice.bvsdkdemoandroid.DemoApp"

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
         android:name=".DemoApp"

bvanalytics/src/main/AndroidManifest.xml

@@ -2,5 +2,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bazaarvoice.bvandroidsdk_analytics">
   <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+
 
 </manifest>

bvcommon/src/main/AndroidManifest.xml

@@ -2,5 +2,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bazaarvoice.bvandroidsdk_common">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
 </manifest>

bvconversations/src/main/AndroidManifest.xml

@@ -2,5 +2,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bazaarvoice.bvandroidsdk_conversations">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
 </manifest>

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/AuthorOptions.java

@@ -47,7 +47,7 @@ public String getValue() {
         }
     }
 
-    public enum FilterOptions {
+    public enum Filter implements UGCOption {
         ID("Id"),
         CONTENT_LOCALE("ContentLocale"),
         HAS_PHOTOS("HasPhotos"),
@@ -60,14 +60,14 @@ public enum FilterOptions {
         TOTAL_REVIEW_COUNT("TotalReviewCount"),
         USER_LOCATION("UserLocation");
 
-        private String value;
+        private final String key;
 
-        FilterOptions(String value) {
-            this.value = value;
+        Filter(String key) {
+            this.key = key;
         }
 
-        public String getValue() {
-            return value;
+        public String getKey() {
+            return this.key;
         }
 
         //                AdditionalField_[FIELD_NAME]
@@ -77,4 +77,5 @@ public String getValue() {
 //        The context data value for the content. DIMENSION_EXTERNAL_ID can be age, gender, etc. e.g. filter=contextdatavalue_age:under21&filter=contextdatavalue_gender:male
 
     }
+
 }

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/BVConversationsClient.java

@@ -114,11 +114,11 @@ public LoadCallDisplay<ReviewsRequest, ReviewResponse> prepareCall(ReviewsReques
         return factoryCreateDisplayCall(ReviewResponse.class, request);
     }
     /**
-     * @param request TopicFilterRequest to be sent
+     * @param request FeatureRequest to be sent
      * @return LoadCall object with the request ready to be sent
      */
-    public LoadCallDisplay<TopicFilterRequest, TopicFilterResponse> prepareCall(TopicFilterRequest request) {
-        return factoryCreateDisplayCall(TopicFilterResponse.class, request);
+    public LoadCallDisplay<FeaturesRequest, FeaturesResponse> prepareCall(FeaturesRequest request) {
+        return factoryCreateDisplayCall(FeaturesResponse.class, request);
     }
 
     public LoadCallDisplay<StoreReviewsRequest, StoreReviewResponse> prepareCall(StoreReviewsRequest request) {

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/BVSecondaryRatingFilter.java

@@ -0,0 +1,26 @@
+package com.bazaarvoice.bvandroidsdk;
+
+public final class BVSecondaryRatingFilter {
+
+    private final String type;
+    private final EqualityOperator equalityOperator;
+    private final String value;
+
+    public BVSecondaryRatingFilter(String type, EqualityOperator equalityOperator, String value) {
+        this.type = type;
+        this.equalityOperator = equalityOperator;
+        this.value = value;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public EqualityOperator getEqualityOperator() {
+        return equalityOperator;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/BasicRequestFactory.java

@@ -48,12 +48,18 @@ class BasicRequestFactory implements RequestFactory {
     private static final String kSORT_REVIEW = "Sort_Reviews";
     private static final String kSORT_QUESTIONS = "Sort_Questions";
     private static final String kSORT_ANSWERS = "Sort_Answers";
+    private static final String kFILTER_REVIEW = "Filter_Reviews";
+    private static final String kFILTER_QUESTIONS = "Filter_Questions";
+    private static final String kFILTER_AUTHORS = "Filter_Authors";
+    private static final String kFILTER_COMMENTS = "Filter_Comments";
     private static final String kINCLUDE = "Include";
     private static final String kSTATS = "Stats";
     private static final String kLIMIT = "Limit";
     private static final String kOFFSET = "Offset";
     private static final String kSEARCH = "Search";
     private static  final String kINCENTIVIZED_STATS = "incentivizedstats";
+    private static  final String kSECONDARY_RATING_STATS = "secondaryratingstats";
+    private static  final String kTAG_STATS = "tagstats";
     private static  final String kFEATURES = "feature";
     private static final String kProductId = "productId";
     private static final String kLanguage = "language";
@@ -136,7 +142,9 @@ class BasicRequestFactory implements RequestFactory {
     private static final String VIDEO_CAPTION_TEMPLATE = "VideoCaption_%d";
     private static final String KEY_RATING_TEMPLATE = "rating_%s";
     private static final String KEY_CDV_TEMPLATE = "contextdatavalue_%s";
+    private static final String KEY_SECONDARY_RATING_TEMPLATE = "SecondaryRating_%s";
     private static final String KEY_FREEFORM_TAG_TEMPLATE = "tag_%s_%d";
+    private static final String KEY_TAG_FILTER_TEMPLATE = "tag_%s";
     // endregion
 
     // region Submit Question Request Keys
@@ -233,8 +241,8 @@ public <RequestType extends ConversationsRequest> Request create(RequestType req
             return createFromBulkProductRequest((BulkProductRequest) request);
         } else if (request instanceof ProductDisplayPageRequest) {
             return createFromProductDisplayPageRequest((ProductDisplayPageRequest) request);
-        } else if (request instanceof TopicFilterRequest) {
-            return createFromTopicFilterRequest((TopicFilterRequest) request);
+        } else if (request instanceof FeaturesRequest) {
+            return createFromFeaturesRequest((FeaturesRequest) request);
         }else if (request instanceof FeedbackSubmissionRequest) {
             return createFromFeedbackSubmissionRequest((FeedbackSubmissionRequest) request);
         } else if (request instanceof ReviewSubmissionRequest) {
@@ -385,6 +393,14 @@ private Request createFromReviewRequest(ReviewsRequest request) {
             httpUrlBuilder.addQueryParameter(kINCENTIVIZED_STATS, request.getIncentivizedStats().toString());
         }
 
+        if (request.getSecondaryratingstats()) {
+            httpUrlBuilder.addQueryParameter(kSECONDARY_RATING_STATS, request.getSecondaryratingstats().toString());
+        }
+
+        if (request.getTagStats()) {
+            httpUrlBuilder.addQueryParameter(kTAG_STATS, request.getTagStats().toString());
+        }
+
         if (request.getFeatures() != null) {
             httpUrlBuilder.addQueryParameter(kFEATURES, request.getFeatures());
         }
@@ -407,6 +423,38 @@ private Request createFromReviewRequest(ReviewsRequest request) {
             httpUrlBuilder.addQueryParameter(kSTATS, statsParam);
         }
 
+        if (request.getContextDataValues()!= null) {
+            final Set<String> contextDataValueKeys = request.getContextDataValues().keySet();
+            for (String key : contextDataValueKeys) {
+                String value = getContextDataValue(key,request.getContextDataValues().get(key));
+                httpUrlBuilder
+                        .addEncodedQueryParameter(kFILTER, value);
+            }
+        }
+
+        if (request.getAdditionalFields()!= null) {
+            final Set<String> additionalFields = request.getAdditionalFields().keySet();
+            for (String key : additionalFields) {
+                String value = addAdditionalQueryParam(key,request.getAdditionalFields().get(key));
+                httpUrlBuilder.addEncodedQueryParameter(kFILTER, value);
+            }
+        }
+
+        if (request.getSecondaryRatings()!= null) {
+            for (BVSecondaryRatingFilter secondaryRatingFilters : request.getSecondaryRatings() ) {
+                String value = addSecondaryRatingsQueryParam(secondaryRatingFilters.getType(), secondaryRatingFilters.getEqualityOperator(), secondaryRatingFilters.getValue());
+                httpUrlBuilder.addEncodedQueryParameter(kFILTER,value);
+            }
+        }
+
+        if (request.getTagFilters()!= null) {
+            final Set<String> tagFilterValues = request.getTagFilters().keySet();
+            for (String key : tagFilterValues) {
+                String value = addTagQueryParam(key,request.getTagFilters().get(key));
+                httpUrlBuilder.addEncodedQueryParameter(kFILTER, value);
+            }
+        }
+
         HttpUrl httpUrl = httpUrlBuilder.build();
 
         Headers.Builder headersBuilder = new Headers.Builder();
@@ -419,6 +467,26 @@ private Request createFromReviewRequest(ReviewsRequest request) {
                 .build();
     }
 
+    private String addSecondaryRatingsQueryParam(String type, EqualityOperator equalityOperator, String value) {
+        final String keyRating = String.format(Locale.US, KEY_SECONDARY_RATING_TEMPLATE, type);
+        return String.format("%s:%s:%s", keyRating,equalityOperator, value);
+    }
+
+    private String getContextDataValue(String key, String value) {
+        final String keyRating = String.format(Locale.US, KEY_CDV_TEMPLATE, key);
+        return String.format("%s:%s", keyRating, value);
+    }
+
+    private String addTagQueryParam(String type, String value) {
+        final String keyRating = String.format(Locale.US, KEY_TAG_FILTER_TEMPLATE, type);
+        return String.format("%s:%s",keyRating, value);
+    }
+
+    private String  addAdditionalQueryParam(String key, String value) {
+        final String keyRating = String.format(Locale.US, KEY_ADDITIONAL_PARAM_TEMPLATE, key);
+        return String.format("%s:%s", keyRating, value);
+    }
+
     private Request createFromQuestionAndAnswerRequest(QuestionAndAnswerRequest request) {
         Request.Builder okRequestBuilder = new Request.Builder();
 
@@ -469,7 +537,7 @@ private Request createFromReviewHighlightsRequest(ReviewHighlightsRequest reques
                 .build();
     }
 
-    private Request createFromTopicFilterRequest(TopicFilterRequest request) {
+    private Request createFromFeaturesRequest(FeaturesRequest request) {
         Request.Builder okRequestBuilder = new Request.Builder();
 
         HttpUrl.Builder httpUrlBuilder = HttpUrl.parse(bvRootApiUrl)
@@ -687,6 +755,10 @@ private Request createFromBulkProductRequest(BulkProductRequest request) {
             httpUrlBuilder.addQueryParameter(kINCENTIVIZED_STATS, request.getIncentivizedStats().toString());
         }
 
+        if (request.getTagStats()) {
+            httpUrlBuilder.addQueryParameter(kTAG_STATS, request.getTagStats().toString());
+        }
+
         HttpUrl httpUrl = httpUrlBuilder.build();
 
         Headers.Builder headersBuilder = new Headers.Builder();
@@ -710,10 +782,18 @@ private Request createFromProductDisplayPageRequest(ProductDisplayPageRequest re
         addCommonQueryParams(httpUrlBuilder, convApiKey, bvMobileInfo);
         addCommonDisplayQueryParams(httpUrlBuilder, request);
         addSortableProductParams(httpUrlBuilder, request);
+        addFilertableProductParams(httpUrlBuilder,request);
         if (request.getIncentivizedStats()) {
             httpUrlBuilder.addQueryParameter(kINCENTIVIZED_STATS, request.getIncentivizedStats().toString());
         }
 
+        if (request.getSecondaryratingStats()) {
+            httpUrlBuilder.addQueryParameter(kSECONDARY_RATING_STATS, request.getSecondaryratingStats().toString());
+        }
+
+        if (request.getTagStats()) {
+            httpUrlBuilder.addQueryParameter(kTAG_STATS, request.getTagStats().toString());
+        }
 
         HttpUrl httpUrl = httpUrlBuilder.build();
 
@@ -979,6 +1059,7 @@ private static void addCommonDisplayQueryParams(HttpUrl.Builder httpUrlBuilder,
         addFilterQueryParams(httpUrlBuilder, request.getFilters());
         addExtraQueryParams(httpUrlBuilder, request.getExtraParams());
         addProductSortParam(httpUrlBuilder, request.getSorts());
+
     }
 
     private static void addFilterQueryParams(HttpUrl.Builder httpUrlBuilder, List<Filter> filters) {
@@ -1028,6 +1109,39 @@ private static void addSortableProductParams(HttpUrl.Builder httpUrlBuilder, Sor
         }
     }
 
+    private static void addFilertableProductParams(HttpUrl.Builder httpUrlBuilder, SortableProductRequest request) {
+        if (!request.getReviewFilter().isEmpty()) {
+            for (Filter filter : request.getReviewFilter()) {
+                httpUrlBuilder
+                        .addEncodedQueryParameter(kFILTER_REVIEW, filter.toString());
+            }
+        }
+
+
+        if (!request.getQuestionFilter().isEmpty()) {
+            for (Filter filter : request.getQuestionFilter()) {
+                httpUrlBuilder
+                        .addEncodedQueryParameter(kFILTER_QUESTIONS, filter.toString());
+            }
+        }
+
+        if (!request.getAuthorFilter().isEmpty()) {
+            for (Filter filter : request.getAuthorFilter()) {
+                httpUrlBuilder
+                        .addEncodedQueryParameter(kFILTER_AUTHORS, filter.toString());
+            }
+
+        }
+
+        if (!request.getCommentFilter().isEmpty()) {
+            for (Filter filter : request.getCommentFilter()) {
+                httpUrlBuilder
+                        .addEncodedQueryParameter(kFILTER_COMMENTS, filter.toString());
+            }
+        }
+
+    }
+
     private static void addProductSortParam(HttpUrl.Builder httpUrlBuilder, List<Sort> sorts) {
         for (Sort sort : sorts) {
             httpUrlBuilder.addEncodedQueryParameter(kSORT, sort.toString());

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/DistributionValue.java

@@ -24,6 +24,8 @@ public class DistributionValue {
     private Integer count;
     @SerializedName("Value")
     private String value;
+    @SerializedName("ValueLabel")
+    private String valueLabel;
 
     public Integer getCount() {
         return count;
@@ -32,4 +34,8 @@ public Integer getCount() {
     public String getValue() {
         return value;
     }
+
+    public String getValueLabel() {
+        return valueLabel;
+    }
 }

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/TopicFeature.java → bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/FeatureKeyword.java

@@ -2,7 +2,7 @@
 
 import com.google.gson.annotations.SerializedName;
 
-public class TopicFeature extends IncludeableContent {
+public class FeatureKeyword extends IncludeableContent {
 
     @SerializedName("feature")
     private String feature;

bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/TopicFeatureResults.java → bvconversations/src/main/java/com/bazaarvoice/bvandroidsdk/Features.java

@@ -4,10 +4,10 @@
 
 import java.util.List;
 
-public class TopicFeatureResults extends IncludeableContent {
+public class Features extends IncludeableContent {
 
     @SerializedName("features")
-    private List<TopicFeature> features;
+    private List<FeatureKeyword> features;
 
     @SerializedName("language")
     private String language;
@@ -16,7 +16,7 @@ public class TopicFeatureResults extends IncludeableContent {
     private String productId;
 
 
-    public List<TopicFeature> getFeatures() {
+    public List<FeatureKeyword> getFeatures() {
         return features;
     }