Subversion Repositories SmartDukaan

Rev

Rev 22131 | Rev 22831 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 22131 Rev 22381
Line 375... Line 375...
375 
                    String json = "";
 375 
                    String json = "";
376 
                    JSONObject jsonObject = new JSONObject();
 376 
                    JSONObject jsonObject = new JSONObject();
377 
                    jsonObject.put("type", "GOOGLE");
 377 
                    jsonObject.put("type", "GOOGLE");
378 
                    jsonObject.put("token", googletoken);
 378 
                    jsonObject.put("token", googletoken);
379 
                    json = jsonObject.toString();
 379 
                    json = jsonObject.toString();
380 
                    HttpPost httppost = new HttpPost(apiData.getString("Web_Api","http://shop2020.in:8080/profitmandi-web")+"/user/googleLogin");
 380 
                    HttpPost httppost = new HttpPost(apiData.getString("Web_Api_Login","http://api.profitmandi.com:8080/profitmandi-web/user/googleLogin"));
381 
                    //HttpPost httppost = new HttpPost(ProfitTillConstants.Web_Api+"/user/googleLogin");
 381 
                    //HttpPost httppost = new HttpPost(ProfitTillConstants.Web_Api+"/user/googleLogin");
382 
                    StringEntity se = new StringEntity(json);
 382 
                    StringEntity se = new StringEntity(json);
383 
                    httppost.setEntity(se);
 383 
                    httppost.setEntity(se);
384 
                    httppost.setHeader("Content-type", "application/json");
 384 
                    httppost.setHeader("Content-type", "application/json");
385 
                    HttpResponse response = httpclient.execute(httppost);
 385 
                    HttpResponse response = httpclient.execute(httppost);
Line 388... Line 388...
388 
                    JSONObject jobj= jObjGmail.getJSONObject("response");
 388 
                    JSONObject jobj= jObjGmail.getJSONObject("response");
389 
                    registered=jobj.getString("registered");
 389 
                    registered=jobj.getString("registered");
390 
                    if(!registered.equalsIgnoreCase(null)) {
 390 
                    if(!registered.equalsIgnoreCase(null)) {
391 
                        String token = jobj.getString("token");
 391 
                        String token = jobj.getString("token");
392 
                        Log.d("token",token);
 392 
                        Log.d("token",token);
393 
                        String email = Plus.AccountApi.getAccountName(mGoogleApiClient);
 - 
 
394 
                        userDataEditor.putString("token", token);
 393 
                        userDataEditor.putString("token", token);
395 
                        userDataEditor.putString("email", email);
 394 
                        userDataEditor.putString("email", Plus.AccountApi.getAccountName(mGoogleApiClient));
396 
                        userDataEditor.putString("registered", registered);
 395 
                        userDataEditor.putString("registered", registered);
397 
                        userDataEditor.putString("type", "google");
 396 
                        userDataEditor.putString("type", "google");
398 
                        userDataEditor.commit();
 397 
                        userDataEditor.commit();
399 
                    }
 398 
                    }
400 
                    else{
 399 
                    else{
Line 447... Line 446...
447 
            }
 446 
            }
448 
            catch (Exception e){
 447 
            catch (Exception e){
449 
                e.printStackTrace();
 448 
                e.printStackTrace();
450 
            }
 449 
            }
451 
        }}
 450 
        }}
452 
    class AuthTokenChange extends AsyncTask<String, Integer, String> {
 451 
     class AuthTokenChange extends AsyncTask<String, Integer, String> {
453 
 
 452 
 
454 
        @Override
 453 
        @Override
455 
        protected void onPreExecute() {
 454 
        protected void onPreExecute() {
456 
 
 455 
 
457 
            super.onPreExecute();
 456 
            super.onPreExecute();
Line 459... Line 458...
459 
 
 458 
 
460 
        @Override
 459 
        @Override
461 
        protected String doInBackground(String... params) {
 460 
        protected String doInBackground(String... params) {
462 
            try {
 461 
            try {
463 
                HttpClient httpclient = new DefaultHttpClient();
 462 
                HttpClient httpclient = new DefaultHttpClient();
464 
                HttpGet httpget = new HttpGet(apiData.getString("Web_Api","http://shop2020.in:8080/profitmandi-web")+"/user/token-info");
 463 
                HttpGet httpget = new HttpGet(apiData.getString("Web_Api_Tokeninfo","http://api.profitmandi.com:8080/profitmandi-web/user/token-info"));
465 
                //HttpGet httpget = new HttpGet(ProfitTillConstants.Web_Api + "/user/token-info");
 464 
                //HttpGet httpget = new HttpGet(ProfitTillConstants.Web_Api + "/user/token-info");
466 
                httpget.setHeader("Auth-Token", userData.getString("token", ""));
 465 
                httpget.setHeader("Auth-Token", userData.getString("token", ""));
467 
                HttpResponse response = httpclient.execute(httpget);
 466 
                HttpResponse response = httpclient.execute(httpget);
468 
                HttpEntity entity = response.getEntity();
 467 
                HttpEntity entity = response.getEntity();
469 
                int status = response.getStatusLine().getStatusCode();
 468 
                int status = response.getStatusLine().getStatusCode();