Loading mobile/android/base/sync/GlobalConstants.java.in +4 −0 Original line number Diff line number Diff line Loading @@ -10,4 +10,8 @@ package org.mozilla.gecko.sync; */ public class GlobalConstants { public static final String PRODUCT_NAME = "@MOZ_APP_DISPLAYNAME@"; public static final String SYNC_VERSION_STRING = "0.6"; public static final String USER_AGENT = "Firefox AndroidSync " + SYNC_VERSION_STRING + " (" + PRODUCT_NAME + ")"; } mobile/android/base/sync/net/SyncStorageRequest.java +6 −38 Original line number Diff line number Diff line /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * * The Original Code is Android Sync Client. * * The Initial Developer of the Original Code is * the Mozilla Foundation. * Portions created by the Initial Developer are Copyright (C) 2011 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Richard Newman <rnewman@mozilla.com> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.mozilla.gecko.sync.net; Loading @@ -43,6 +10,8 @@ import java.net.URISyntaxException; import java.security.GeneralSecurityException; import java.util.HashMap; import org.mozilla.gecko.sync.GlobalConstants; import android.util.Log; import ch.boye.httpclientandroidlib.HttpEntity; Loading Loading @@ -163,7 +132,7 @@ public class SyncStorageRequest implements Resource { @Override public void addHeaders(HttpRequestBase request, DefaultHttpClient client) { client.getParams().setParameter(CoreProtocolPNames.USER_AGENT, USER_AGENT); client.getParams().setParameter(CoreProtocolPNames.USER_AGENT, GlobalConstants.USER_AGENT); // Clients can use their delegate interface to specify X-If-Unmodified-Since. String ifUnmodifiedSince = this.request.delegate.ifUnmodifiedSince(); Loading @@ -176,7 +145,6 @@ public class SyncStorageRequest implements Resource { } } public static String USER_AGENT = "Firefox AndroidSync 0.5"; protected SyncResourceDelegate resourceDelegate; public SyncStorageRequestDelegate delegate; protected BaseResource resource; Loading Loading
mobile/android/base/sync/GlobalConstants.java.in +4 −0 Original line number Diff line number Diff line Loading @@ -10,4 +10,8 @@ package org.mozilla.gecko.sync; */ public class GlobalConstants { public static final String PRODUCT_NAME = "@MOZ_APP_DISPLAYNAME@"; public static final String SYNC_VERSION_STRING = "0.6"; public static final String USER_AGENT = "Firefox AndroidSync " + SYNC_VERSION_STRING + " (" + PRODUCT_NAME + ")"; }
mobile/android/base/sync/net/SyncStorageRequest.java +6 −38 Original line number Diff line number Diff line /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * * The Original Code is Android Sync Client. * * The Initial Developer of the Original Code is * the Mozilla Foundation. * Portions created by the Initial Developer are Copyright (C) 2011 * the Initial Developer. All Rights Reserved. * * Contributor(s): * Richard Newman <rnewman@mozilla.com> * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), * in which case the provisions of the GPL or the LGPL are applicable instead * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.mozilla.gecko.sync.net; Loading @@ -43,6 +10,8 @@ import java.net.URISyntaxException; import java.security.GeneralSecurityException; import java.util.HashMap; import org.mozilla.gecko.sync.GlobalConstants; import android.util.Log; import ch.boye.httpclientandroidlib.HttpEntity; Loading Loading @@ -163,7 +132,7 @@ public class SyncStorageRequest implements Resource { @Override public void addHeaders(HttpRequestBase request, DefaultHttpClient client) { client.getParams().setParameter(CoreProtocolPNames.USER_AGENT, USER_AGENT); client.getParams().setParameter(CoreProtocolPNames.USER_AGENT, GlobalConstants.USER_AGENT); // Clients can use their delegate interface to specify X-If-Unmodified-Since. String ifUnmodifiedSince = this.request.delegate.ifUnmodifiedSince(); Loading @@ -176,7 +145,6 @@ public class SyncStorageRequest implements Resource { } } public static String USER_AGENT = "Firefox AndroidSync 0.5"; protected SyncResourceDelegate resourceDelegate; public SyncStorageRequestDelegate delegate; protected BaseResource resource; Loading