From 3ae0dc1b41500395263c36a2528e682ee1897859 Mon Sep 17 00:00:00 2001 From: Connor Dunn Date: Tue, 7 Dec 2010 21:37:58 +0000 Subject: [PATCH] Don't allow blank names, fix utf-8 issues. --- android/bin/Android TabCloud.apk | Bin 6597 -> 6597 bytes android/bin/resources.ap_ | Bin 4024 -> 4024 bytes .../uk/co/connorhd/tabcloud/AddServlet.java | 4 ++-- .../uk/co/connorhd/tabcloud/LoginServlet.java | 2 +- .../co/connorhd/tabcloud/LogoutServlet.java | 2 +- .../co/connorhd/tabcloud/RemoveServlet.java | 4 ++-- .../co/connorhd/tabcloud/TabCloudServlet.java | 4 ++-- .../co/connorhd/tabcloud/UpdateServlet.java | 4 ++-- .../uk/co/connorhd/tabcloud/AddServlet.class | Bin 2964 -> 2994 bytes .../co/connorhd/tabcloud/LoginServlet.class | Bin 2091 -> 2106 bytes .../co/connorhd/tabcloud/LogoutServlet.class | Bin 2118 -> 2133 bytes .../co/connorhd/tabcloud/RemoveServlet.class | Bin 2873 -> 2903 bytes .../connorhd/tabcloud/TabCloudServlet.class | Bin 3508 -> 3538 bytes .../co/connorhd/tabcloud/UpdateServlet.class | Bin 2913 -> 2943 bytes chrome/background.html | 1 + chrome/manifest.json | 2 +- chrome/popup.html | 7 +++++++ 17 files changed, 19 insertions(+), 11 deletions(-) diff --git a/android/bin/Android TabCloud.apk b/android/bin/Android TabCloud.apk index 701cd8cd0605424231e57e06d5f3de6c4eb4bbe1..f7941a82130597ebecd805d41328500635abfb44 100644 GIT binary patch delta 131 zcmX?VeAJjXz?+$civa|#u5Mq*%f)aQN$6#NEMw0Ry>(W!UZHV*;B#}qTabCloud
\"TabCloud\"
You are now logged in.
Click the TabCloud menu icon to access TabCloud.
"); } else { resp.sendRedirect(userService.createLoginURL(req.getRequestURI())); diff --git a/appengine-java/src/uk/co/connorhd/tabcloud/LogoutServlet.java b/appengine-java/src/uk/co/connorhd/tabcloud/LogoutServlet.java index ef998f9..fc1b7fd 100644 --- a/appengine-java/src/uk/co/connorhd/tabcloud/LogoutServlet.java +++ b/appengine-java/src/uk/co/connorhd/tabcloud/LogoutServlet.java @@ -14,7 +14,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) User user = userService.getCurrentUser(); if (user == null) { - resp.setContentType("text/html"); + resp.setContentType("text/html; charset=utf-8"); resp.getWriter().println("TabCloud
\"TabCloud\"
You are now logged out.
You will have to login again to access your saved windows on TabCloud.
"); } else { resp.sendRedirect(userService.createLogoutURL(req.getRequestURI())); diff --git a/appengine-java/src/uk/co/connorhd/tabcloud/RemoveServlet.java b/appengine-java/src/uk/co/connorhd/tabcloud/RemoveServlet.java index 6b98bfa..47a74d5 100644 --- a/appengine-java/src/uk/co/connorhd/tabcloud/RemoveServlet.java +++ b/appengine-java/src/uk/co/connorhd/tabcloud/RemoveServlet.java @@ -37,10 +37,10 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) // New user pm.close(); } - resp.setContentType("text/plain"); + resp.setContentType("text/plain; charset=utf-8"); resp.getWriter().println("{\"status\": \"loggedin\"}"); } else { - resp.setContentType("text/json"); + resp.setContentType("text/json; charset=utf-8"); resp.getWriter().println("{\"status\": \"loggedout\"}"); } } diff --git a/appengine-java/src/uk/co/connorhd/tabcloud/TabCloudServlet.java b/appengine-java/src/uk/co/connorhd/tabcloud/TabCloudServlet.java index 45ad808..ad77cbf 100644 --- a/appengine-java/src/uk/co/connorhd/tabcloud/TabCloudServlet.java +++ b/appengine-java/src/uk/co/connorhd/tabcloud/TabCloudServlet.java @@ -45,10 +45,10 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) if (windowString != "") windowString = windowString.substring(0, windowString.length()-1); pm.close(); - resp.setContentType("text/plain"); + resp.setContentType("text/plain; charset=utf-8"); resp.getWriter().println("{\"status\": \"loggedin\", \"windows\": ["+windowString+"]}"); } else { - resp.setContentType("text/json"); + resp.setContentType("text/json; charset=utf-8"); resp.getWriter().println("{\"status\": \"loggedout\"}"); } } diff --git a/appengine-java/src/uk/co/connorhd/tabcloud/UpdateServlet.java b/appengine-java/src/uk/co/connorhd/tabcloud/UpdateServlet.java index 19ee9a5..33f5122 100644 --- a/appengine-java/src/uk/co/connorhd/tabcloud/UpdateServlet.java +++ b/appengine-java/src/uk/co/connorhd/tabcloud/UpdateServlet.java @@ -36,10 +36,10 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) } catch (Exception e) { pm.close(); } - resp.setContentType("text/plain"); + resp.setContentType("text/plain; charset=utf-8"); resp.getWriter().println("{\"status\": \"loggedin\"}"); } else { - resp.setContentType("text/json"); + resp.setContentType("text/json; charset=utf-8"); resp.getWriter().println("{\"status\": \"loggedout\"}"); } } diff --git a/appengine-java/war/WEB-INF/classes/uk/co/connorhd/tabcloud/AddServlet.class b/appengine-java/war/WEB-INF/classes/uk/co/connorhd/tabcloud/AddServlet.class index f8818a780fbc99dd27cc6bb7969c7773b187212a..fa36ebb543fb94ad84fe270706bde643b5263b79 100644 GIT binary patch delta 69 zcmbOtzDaz;e^x2UlGKV4{eqmt%sgv_ma8+PKAd{p-Noqxjenv@dj8#>>blJ^6 H*c@2^QN|d2 delta 39 rcmcaEwo_~a8yh!QNoqxjenC!RX5M54w!2)MV18C{e%@v=c1IQf46Y3V diff --git a/appengine-java/war/WEB-INF/classes/uk/co/connorhd/tabcloud/TabCloudServlet.class b/appengine-java/war/WEB-INF/classes/uk/co/connorhd/tabcloud/TabCloudServlet.class index d5cf0567bcc2f8b9457839a0b75626d314c9c7fb..ac4fbdf73e3abc5f50ae42c8433c95f898f168ff 100644 GIT binary patch delta 69 zcmdlYeMx%5I(8|^lGKV4{eqmt%sgv_}4NoqxjenC!RW}dY|az8#>>blJ@k H?4B$DZ`l|% delta 39 rcmew__E2nt8XGrPNoqxjenC!RX5M56w!2)MV18C{e%@v?c25=nAHEH` diff --git a/chrome/background.html b/chrome/background.html index b3a20fc..f239e5b 100644 --- a/chrome/background.html +++ b/chrome/background.html @@ -1,5 +1,6 @@ + @@ -17,6 +18,9 @@ return names[name]; }; var setWindowName = function (name, value) { + if (value.length == 0) { + value = 'Window'; + } var names = JSON.parse(localStorage.tempWindowNames) names[name] = value; localStorage.tempWindowNames = JSON.stringify(names); @@ -355,6 +359,9 @@ background-color: #ccc; border-radius: 2px; } + #trash .tabplaceholder { + opacity: 0.6; + } body { width: 300px; font-size: 0.9em;