Projects >> stackmob-java-client-sdk >>58f6f362fe3c804a8726a41f1c90884c1a27b234

Chunk
Conflicting content
        StackMobRequest req;
    /**
     * login to StackMob with gigya credentials. If a corresponding StackMob user didn't exist before, it will
     * be created.
<<<<<<< HEAD
     * @param gigyaUid The parameter UID
     * @param timestamp The parameter signatureTimestamp
     * @param sig The parameter UIDSignature
     * @param options additional options, such as headers, to modify the request
     * @param callback callback to be called when the server returns. may execute in a separate thread
     */
    public void gigyaLogin(String gigyaUid, String timestamp, String sig, StackMobOptions options, StackMobRawCallback callback) {
        List> paramList = new LinkedList>();
        paramList.add(new Pair("gigya_uid", gigyaUid));
        paramList.add(new Pair("gigya_ts", timestamp));
=======
     * @param gigyaUid
     * @param timestamp
     * @param sig
     * @param options additional options, such as headers, to modify the request
     * @param callback callback to be called when the server returns. may execute in a separate thread
     */
    public void gigyaLogin(String gigyaUid, long timestamp, String sig, StackMobOptions options, StackMobRawCallback callback) {
        List> paramList = new LinkedList>();
        paramList.add(new Pair("gigya_uid", gigyaUid));
        paramList.add(new Pair("gigya_ts", String.valueOf(timestamp)));
>>>>>>> f06d12a511831507bc1a95f6a7c06bc5afb43486
        paramList.add(new Pair("gigya_sig", sig));
Solution content
    /**
     * login to StackMob with gigya credentials. If a corresponding StackMob user didn't exist before, it will
     * be created.
     * @param gigyaUid The parameter UID
     * @param timestamp The parameter signatureTimestamp
     * @param sig The parameter UIDSignature
     * @param options additional options, such as headers, to modify the request
     * @param callback callback to be called when the server returns. may execute in a separate thread
     */
    public void gigyaLogin(String gigyaUid, String timestamp, String sig, StackMobOptions options, StackMobRawCallback callback) {
        List> paramList = new LinkedList>();
        paramList.add(new Pair("gigya_uid", gigyaUid));
        paramList.add(new Pair("gigya_ts", timestamp));
        paramList.add(new Pair("gigya_sig", sig));

        StackMobRequest req;
File
StackMob.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Variable