Send Person data with conversation creation, instead of later. This e…

…nables surveys to be targeted to person custom data right from the first launch of the app.

apptentive-android-sdk/src/com/apptentive/android/sdk/Apptentive.java

@@ -814,10 +814,9 @@ private static void fetchConversationToken(Context context) {
 		ConversationTokenRequest request = new ConversationTokenRequest();
 
 		// Send the Device and Sdk now, so they are available on the server from the start.
-		Device device = DeviceManager.storeDeviceAndReturnIt(context);
-		request.setDevice(device);
-		Sdk sdk = SdkManager.storeSdkAndReturnIt(context);
-		request.setSdk(sdk);
+		request.setDevice(DeviceManager.storeDeviceAndReturnIt(context));
+		request.setSdk(SdkManager.storeSdkAndReturnIt(context));
+		request.setPerson(PersonManager.storePersonAndReturnIt(context));
 
 		// TODO: Allow host app to send a user id, if available.
 		ApptentiveHttpResponse response = ApptentiveClient.getConversationToken(request);

apptentive-android-sdk/src/com/apptentive/android/sdk/storage/PersonManager.java

@@ -45,6 +45,26 @@ public static Person storePersonAndReturnDiff(Context context) {
 		return null;
 	}
 
+	/**
+	 * Provided so we can be sure that the person we send during conversation creation is 100% accurate. Since we do not
+	 * queue this person up in the payload queue, it could otherwise be lost.
+	 */
+	public static Person storePersonAndReturnIt(Context context) {
+		Person current = generateCurrentPerson();
+
+		CustomData customData = loadCustomPersonData(context);
+		current.setCustomData(customData);
+
+		String email = loadPersonEmail(context);
+		if (email == null) {
+			email = loadInitialPersonEmail(context);
+		}
+		current.setEmail(email);
+
+		storePerson(context, current);
+		return current;
+	}
+
 	public static CustomData loadCustomPersonData(Context context) {
 		SharedPreferences prefs = context.getSharedPreferences(Constants.PREF_NAME, Context.MODE_PRIVATE);
 		String personDataString = prefs.getString(Constants.PREF_KEY_PERSON_DATA, null);