Merge branch 'ubilabs--tracking_app--develop--hotfix--qrcode_parameter_naming' into ubilabs--tracking_app--develop

This commit is contained in:
Samuel Oey committed 2015-03-04 20:50:46 +01:00
commit cd6bca7d60
1 file changed
+2 -2
@@ -4,8 +4,8 @@ import org.json.JSONException;
import org.json.JSONObject;
public class CheckinHelper {
public static final String LEADERBOARD_NAME = "leaderboardName";
public static final String COMPETITOR_ID = "competitorId";
public static final String LEADERBOARD_NAME = "leaderboard_name";
public static final String COMPETITOR_ID = "competitor_id";
public static final String EVENT_ID = "event_id";
public static JSONObject getCheckinJson(String competitorId, String deviceUuid, String pushDeviceId, long fromMillis) throws JSONException