Fix setting cookies.

amahi · Aug 4, 2014 · 867998b · 867998b
1 parent ae3411a
commit 867998b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/org/amahi/anywhere/activity/ServerAppActivity.java b/src/main/java/org/amahi/anywhere/activity/ServerAppActivity.java
@@ -22,6 +22,7 @@
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
@@ -72,9 +73,11 @@ private void setUpApp(Bundle state) {
 
 	private void setUpAppWebCookie() {
 		String appHost = getApp().getHost();
-		String appCookie = Preferences.ofCookie(this).getAppCookie(appHost);
+		String appCookies = Preferences.ofCookie(this).getAppCookies(appHost);
 
-		CookieManager.getInstance().setCookie(getAppUrl(), appCookie);
+		for (String appCookie : TextUtils.split(appCookies, ";")) {
+			CookieManager.getInstance().setCookie(getAppUrl(), appCookie);
+		}
 	}
 
 	private void setUpAppWebAgent() {
@@ -204,9 +207,9 @@ protected void onDestroy() {
 
 	private void tearDownAppWebCookie() {
 		String appHost = getApp().getHost();
-		String appCookie = CookieManager.getInstance().getCookie(getAppUrl());
+		String appCookies = CookieManager.getInstance().getCookie(getAppUrl());
 
-		Preferences.ofCookie(this).setAppCookie(appHost, appCookie);
+		Preferences.ofCookie(this).setAppCookies(appHost, appCookies);
 
 		CookieManager.getInstance().removeAllCookie();
 	}

diff --git a/src/main/java/org/amahi/anywhere/util/Preferences.java b/src/main/java/org/amahi/anywhere/util/Preferences.java
@@ -50,19 +50,19 @@ private Preferences(Context context, String location) {
 		this.preferences = context.getSharedPreferences(location, Context.MODE_PRIVATE);
 	}
 
-	public String getAppCookie(String appHost) {
+	public String getAppCookies(String appHost) {
 		return getString(appHost);
 	}
 
 	private String getString(String key) {
 		return preferences.getString(key, Defaults.STRING);
 	}
 
-	private void setString(String key, String value) {
-		preferences.edit().putString(key, value).apply();
+	public void setAppCookies(String appHost, String appCookies) {
+		setString(appHost, appCookies);
 	}
 
-	public void setAppCookie(String appHost, String appCookie) {
-		setString(appHost, appCookie);
+	private void setString(String key, String value) {
+		preferences.edit().putString(key, value).apply();
 	}
 }