fergalmoran/chrometophone
1
0
Fork 0
mirror of https://github.com/fergalmoran/chrometophone.git synced 2025-12-22 09:41:51 +00:00
Code Issues 265 Packages Projects Releases Wiki Activity

Better fix suggested by Dave: trim title first, trim sel if still needed. Refactored

Browse Source 
the code a bit to be testable ( test needs a bit of cleanup, later ).
This commit is contained in:
costin
2010-09-10 00:05:41 +00:00
parent 1e833c971f
commit fdd86e78c0
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appengine/c2dm/com/google/android/c2dm/server/C2DMessaging.java
View File

@@ -64,6 +64,11 @@ public class C2DMessaging {
final C2DMConfigLoader serverConfig;
// Testing
protected C2DMessaging() {
serverConfig = null;
}
private C2DMessaging(C2DMConfigLoader serverConfig) {
this.serverConfig = serverConfig;
}

50
appengine/src/com/google/android/chrometophone/server/SendServlet.java
View File

@@ -76,15 +76,8 @@ public class SendServlet extends HttpServlet {
resp.getWriter().println(ERROR_STATUS + " (Must specify url and title parameters)");
return;
}
if (title == null || url.length() + title.length() + sel.length() >
1000) {
// Shorten the title - C2DM has a 1024 limit, some padding for keys
title = ""; // any better default ?
if (url.length() + sel.length() > 1000) {
sel = "";
}
// TODO: when we have history, save the url/title/sel in the history
// and send a pointer, have device fetch it.
if (title == null) {
title = "";
}
String deviceId = req.getParameter("deviceId");
@@ -139,12 +132,7 @@ public class SendServlet extends HttpServlet {
// if name or value are null - they'll be skipped
try {
res = push.sendNoRetry(deviceInfo.getDeviceRegistrationID(),
collapseKey,
"url", url,
"title", title,
"sel", sel,
"debug", deviceInfo.getDebug() ? "1" : null);
res = doSend(url, title, sel, push, collapseKey, deviceInfo);
if (res) {
log.info("Link sent to phone! collapse_key:" + collapseKey);
@@ -173,4 +161,36 @@ public class SendServlet extends HttpServlet {
return false;
}
}
boolean doSend(String url, String title, String sel, C2DMessaging push,
String collapseKey, DeviceInfo deviceInfo) throws IOException {
// Trim title, sel if needed.
if (url.length() + title.length() + sel.length() > 1000) {
// Shorten the title - C2DM has a 1024 limit, some padding for keys
if (title.length() > 16) {
title = title.substring(0, 16);
}
// still not enough ?
if (title.length() + url.length() + sel.length() > 1000) {
// how much space we have for sel ?
int space = 1000 - url.length() - title.length();
if (space > 0 && sel.length() > space) {
sel = sel.substring(0, space);
} // else: we'll get an error sending
}
// TODO: when we have history, save the url/title/sel in the history
// and send a pointer, have device fetch it.
}
boolean res;
res = push.sendNoRetry(deviceInfo.getDeviceRegistrationID(),
collapseKey,
"url", url,
"title", title,
"sel", sel,
"debug", deviceInfo.getDebug() ? "1" : null);
return res;
}
}