Pass User Properties to RC Fetch Request as a JSONObject (#986)

clp93 · web-flow · commit 09eaa70417d9 · 2019-11-20T09:53:41.000-08:00
* Explicitly create JSONObject from user properties map * Run Bandwagoner Test App and tests on API level 16 * Fix with API 19 and below #973
diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle
@@ -53,7 +53,7 @@ android {
 
 firebaseTestLab {
     device 'model=walleye,version=26,locale=en,orientation=portrait'
-
+    device 'model=walleye,version=16,locale=en,orientation=portrait'
 }
 
 dependencies {
diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java
@@ -310,7 +310,7 @@ private JSONObject createFetchRequestBody(
     requestBodyMap.put(PACKAGE_NAME, context.getPackageName());
     requestBodyMap.put(SDK_VERSION, BuildConfig.VERSION_NAME);
 
-    requestBodyMap.put(ANALYTICS_USER_PROPERTIES, analyticsUserProperties);
+    requestBodyMap.put(ANALYTICS_USER_PROPERTIES, new JSONObject(analyticsUserProperties));
 
     return new JSONObject(requestBodyMap);
   }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ android {`
`53`	`53`
`54`	`54`	`firebaseTestLab {`
`55`	`55`	`device 'model=walleye,version=26,locale=en,orientation=portrait'`
`56`		`-`
	`56`	`+ device 'model=walleye,version=16,locale=en,orientation=portrait'`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ private JSONObject createFetchRequestBody(`
`310`	`310`	`requestBodyMap.put(PACKAGE_NAME, context.getPackageName());`
`311`	`311`	`requestBodyMap.put(SDK_VERSION, BuildConfig.VERSION_NAME);`
`312`	`312`
`313`		`- requestBodyMap.put(ANALYTICS_USER_PROPERTIES, analyticsUserProperties);`
	`313`	`+ requestBodyMap.put(ANALYTICS_USER_PROPERTIES, new JSONObject(analyticsUserProperties));`
`314`	`314`
`315`	`315`	`return new JSONObject(requestBodyMap);`
`316`	`316`	`}`