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

Change share from device to only go to Chrome (simpler mental model for now).

Browse Source 
More robustness to browser channel.
Temporary logging.
This commit is contained in:
burke.davey
2011-05-11 20:34:49 +00:00
parent cdcab027dc
commit 768ea20aa1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/src/com/google/android/apps/chrometophone/ShareLinkActivity.java
View File

@@ -79,9 +79,7 @@ public class ShareLinkActivity extends Activity implements Handler.Callback {
try { try {
List<NameValuePair> params = new ArrayList<NameValuePair>(); List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new BasicNameValuePair("url", mPendingLink)); params.add(new BasicNameValuePair("url", mPendingLink));
params.add(new BasicNameValuePair("deviceName", "Chrome," + params.add(new BasicNameValuePair("deviceName", "Chrome"));
(DeviceRegistrar.isTablet(ShareLinkActivity.this) ? "Phone" : "Tablet")));
SharedPreferences settings = Prefs.get(ShareLinkActivity.this); SharedPreferences settings = Prefs.get(ShareLinkActivity.this);
final String accountName = settings.getString("accountName", null); final String accountName = settings.getString("accountName", null);
if (accountName == null) { if (accountName == null) {

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

@@ -120,6 +120,9 @@ public class SendServlet extends HttpServlet {
deviceInfo, reqDebug); deviceInfo, reqDebug);
} }
// ***** TEMP LOGGING for debugging on test version. Remove before production push *****
log.info("Sending " + url + " to " + deviceInfo.getDeviceRegistrationID());
if (res) { if (res) {
log.info("Link sent to phone! collapse_key:" + collapseKey); log.info("Link sent to phone! collapse_key:" + collapseKey);
ok = true; ok = true;

4
extension/send_logic.js
View File

@@ -150,6 +150,10 @@ function initializeBrowserChannel() {
} else if (req.responseText.indexOf('NOT_ENABLED') == 0) { } else if (req.responseText.indexOf('NOT_ENABLED') == 0) {
console.log('Not initializing browser channel because feature not enabled for user'); console.log('Not initializing browser channel because feature not enabled for user');
} }
} else { // server not happy, random backoff
var delay = Math.random() * 20000;
console.log('Failed to register browser channel (' + req.status + '), retrying in ' + delay + 'ms');
setTimeout('initializeBrowserChannel()', delay);
} }
}, { }, {
'method': 'POST', 'method': 'POST',