Bug 1046020 - Include URI port in token server audiences. r=nalexander

========

5b97feec90
Author: Ben Curtis <androiddev@nosolutions.com>
    Bug 1046020 - Include URI port in token server audiences.

--HG--
extra : amend_source : 706eaa493e969ce27470aafd482f6b61f5f88db8

mobile/android/base/background/fxa/FxAccountUtils.java

@@ -185,6 +185,6 @@ public class FxAccountUtils {
    */
   public static String getAudienceForURL(String serverURI) throws URISyntaxException {
     URI uri = new URI(serverURI);
-    return new URI(uri.getScheme(), uri.getHost(), null, null).toString();
+    return new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), null, null, null).toString();
   }
 }

mobile/android/base/browserid/MockMyIDTokenFactory.java

@@ -21,7 +21,7 @@ public class MockMyIDTokenFactory {
   public static final BigInteger MOCKMYID_g = new BigInteger("c52a4a0ff3b7e61fdf1867ce84138369a6154f4afa92966e3c827e25cfa6cf508b90e5de419e1337e07a2e9e2a3cd5dea704d175f8ebf6af397d69e110b96afb17c7a03259329e4829b0d03bbc7896b15b4ade53e130858cc34d96269aa89041f409136c7242a38895c9d5bccad4f389af1d7a4bd1398bd072dffa896233397a", 16);
 
   // Computed lazily by static <code>getMockMyIDPrivateKey</code>.
-  protected static SigningPrivateKey cachedMockMyIDPrivateKey;
+  protected static SigningPrivateKey cachedMockMyIDPrivateKey = null;
 
   public static SigningPrivateKey getMockMyIDPrivateKey() throws NoSuchAlgorithmException, InvalidKeySpecException {
     if (cachedMockMyIDPrivateKey == null) {

mobile/android/base/fxa/authenticator/FxAccountAuthenticatorService.java

@@ -14,7 +14,7 @@ public class FxAccountAuthenticatorService extends Service {
   public static final String LOG_TAG = FxAccountAuthenticatorService.class.getSimpleName();
 
   // Lazily initialized by <code>getAuthenticator</code>.
-  protected FxAccountAuthenticator accountAuthenticator;
+  protected FxAccountAuthenticator accountAuthenticator = null;
 
   protected synchronized FxAccountAuthenticator getAuthenticator() {
     if (accountAuthenticator == null) {

mobile/android/base/fxa/sync/FxAccountSyncAdapter.java

@@ -74,7 +74,7 @@ public class FxAccountSyncAdapter extends AbstractThreadedSyncAdapter {
   // Used to do cheap in-memory rate limiting. Don't sync again if we
   // successfully synced within this duration.
   private static final int MINIMUM_SYNC_DELAY_MILLIS = 15 * 1000;        // 15 seconds.
-  private volatile long lastSyncRealtimeMillis;
+  private volatile long lastSyncRealtimeMillis = 0L;
 
   protected final ExecutorService executor;
   protected final FxAccountNotificationManager notificationManager;

mobile/android/base/fxa/sync/FxAccountSyncService.java

@@ -10,7 +10,7 @@ import android.os.IBinder;
 
 public class FxAccountSyncService extends Service {
   private static final Object syncAdapterLock = new Object();
-  private static FxAccountSyncAdapter syncAdapter;
+  private static FxAccountSyncAdapter syncAdapter = null;
 
   @Override
   public void onCreate() {

mobile/android/base/fxa/sync/FxAccountSyncStatusHelper.java

@@ -23,7 +23,7 @@ public class FxAccountSyncStatusHelper implements SyncStatusObserver {
   @SuppressWarnings("unused")
   private static final String LOG_TAG = FxAccountSyncStatusHelper.class.getSimpleName();
 
-  protected static FxAccountSyncStatusHelper sInstance;
+  protected static FxAccountSyncStatusHelper sInstance = null;
 
   public synchronized static FxAccountSyncStatusHelper getInstance() {
     if (sInstance == null) {
@@ -33,7 +33,7 @@ public class FxAccountSyncStatusHelper implements SyncStatusObserver {
   }
 
   // Used to unregister this as a listener.
-  protected Object handle;
+  protected Object handle = null;
 
   // Maps delegates to whether their underlying Android account was syncing the
   // last time we observed a status change.

mobile/android/base/fxa/tasks/FxAccountSetupTask.java

@@ -85,9 +85,9 @@ public abstract class FxAccountSetupTask<T> extends AsyncTask<Void, Void, InnerR
 
   protected static class InnerRequestDelegate<T> implements RequestDelegate<T> {
     protected final CountDownLatch latch;
-    public T response;
-    public Exception exception;
-    public FxAccountClientRemoteException failure;
+    public T response = null;
+    public Exception exception = null;
+    public FxAccountClientRemoteException failure = null;
 
     protected InnerRequestDelegate(CountDownLatch latch) {
       this.latch = latch;