Skip to content

Dialing in cookie settings a little more. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tstellanova-sfdc merged 1 commit into from
Dec 15, 2011
Merged

Dialing in cookie settings a little more. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added dist/SalesforceSDK-1.0.2.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/SalesforceSDK.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SalesforceSDK-1.0.1.jar
SalesforceSDK-1.0.2.jar
2 changes: 1 addition & 1 deletion native/SalesforceSDK/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.salesforce.androidsdk"
android:versionCode="1"
android:versionName="1.0.1">
android:versionName="1.0.2">

<application />
</manifest>
2 changes: 1 addition & 1 deletion native/SalesforceSDK/src/com/salesforce/androidsdk/app/ForceApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public abstract class ForceApp extends Application {
/**
* Current version of this SDK.
*/
public static final String SDK_VERSION = "1.0.1";
public static final String SDK_VERSION = "1.0.2";

/**
* Instance of the ForceApp to use for this process.
Expand Down
14 changes: 7 additions & 7 deletions native/SalesforceSDK/src/com/salesforce/androidsdk/phonegap/SalesforceOAuthPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,23 +323,23 @@ private static void setSidCookies(WebView webView, RestClient client) {
CookieSyncManager cookieSyncMgr = CookieSyncManager.getInstance();

CookieManager cookieMgr = CookieManager.getInstance();
cookieMgr.setAcceptCookie(true); // Required to set additional cookies that the auth process will return.
cookieMgr.removeSessionCookie();

SystemClock.sleep(250); // removeSessionCookies kicks out a thread - let it finish

String accessToken = client.getAuthToken();
String domain = client.getClientInfo().instanceUrl.getHost();

//set the cookie on all possible domains we could access
addSidCookieForDomain(cookieMgr, domain, domain, accessToken);
addSidCookieForDomain(cookieMgr,".force.com", "visual.force.com", accessToken);
addSidCookieForDomain(cookieMgr,".salesforce.com", "salesforce.com", accessToken);
// Android 3.0+ clients want to use the standard .[domain] format. Earlier clients will only work
// with the [domain] format. Set them both; each platform will leverage its respective format.
addSidCookieForDomain(cookieMgr,"salesforce.com", accessToken);
addSidCookieForDomain(cookieMgr,".salesforce.com", accessToken);

cookieSyncMgr.sync();
}

private static void addSidCookieForDomain(CookieManager cookieMgr, String domain, String domainInCookie, String sid) {
String cookieStr = "sid=" + sid + "; domain=" + domainInCookie;
private static void addSidCookieForDomain(CookieManager cookieMgr, String domain, String sid) {
String cookieStr = "sid=" + sid;
cookieMgr.setCookie(domain, cookieStr);
}

Expand Down