* but a stale session ID will cause the WebView to redirect
                     * to the web login.
                     */
<<<<<<< HEAD
					SalesforceDroidGapActivity.this.client.sendAsync(RestRequest.getRequestForResources(ApiVersionStrings.getVersionNumber(SalesforceDroidGapActivity.this)), new AsyncRequestCallback() {

						@Override
						public void onSuccess(RestRequest request, RestResponse response) {
                        	/*
                        	 * The client instance being used here needs to be
                        	 * refreshed, to ensure we use the new access token. 
                        	 */
							SalesforceDroidGapActivity.this.client = SalesforceDroidGapActivity.this.clientManager.peekRestClient();
							setSidCookies();
							loadVFPingPage();
                            getAuthCredentials(callbackContext);
						}

						@Override
						public void onError(Exception exception) {
							if (callbackContext != null) {
								callbackContext.error(exception.getMessage());
							}
						}
					});
				}
=======
	                SalesforceDroidGapActivity.this.client.sendAsync(RestRequest.getRequestForResources(ApiVersionStrings.getVersionNumber(SalesforceDroidGapActivity.this)), new AsyncRequestCallback() {

                        @Override
                        public void onSuccess(RestRequest request, RestResponse response) {
							runOnUiThread(new Runnable() {

								@Override
								public void run() {
									/*
									 * The client instance being used here needs to be
									 * refreshed, to ensure we use the new access token.
									 */
									SalesforceDroidGapActivity.this.client = SalesforceDroidGapActivity.this.clientManager.peekRestClient();
									setSidCookies();
									loadVFPingPage();
									if (callbackContext != null) {
										callbackContext.success(getJSONCredentials());
									}
								}
							});
                        }

                        @Override
                        public void onError(Exception exception) {
                        	if (callbackContext != null) {
                            	callbackContext.error(exception.getMessage());
                        	}
                        }
                    });
	            }
>>>>>>> e3b09d0e11d88a1daf68d2be9f192e9a01e5a740
			}
		});
    }

                     * but a stale session ID will cause the WebView to redirect
                     * to the web login.
                     */
					SalesforceDroidGapActivity.this.client.sendAsync(RestRequest.getRequestForResources(ApiVersionStrings.getVersionNumber(SalesforceDroidGapActivity.this)), new AsyncRequestCallback() {

						@Override
						public void onSuccess(RestRequest request, RestResponse response) {
                            runOnUiThread(new Runnable() {
                                @Override
                                public void run() {
                                    /*
                                     * The client instance being used here needs to be
                                     * refreshed, to ensure we use the new access token.
                                     */
                                    SalesforceDroidGapActivity.this.client = SalesforceDroidGapActivity.this.clientManager.peekRestClient();
                                    setSidCookies();
                                    loadVFPingPage();
                                    getAuthCredentials(callbackContext);
                                }
                            });
                        }

						@Override
						public void onError(Exception exception) {
							if (callbackContext != null) {
								callbackContext.error(exception.getMessage());
							}
						}
					});
				}
			}
		});
    }