Fix method for authentication token generation

pixmob · Feb 7, 2013 · fd9c7f3 · fd9c7f3
1 parent 81df962
commit fd9c7f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/org/pixmob/httpclient/AbstractAccountAuthenticator.java b/src/org/pixmob/httpclient/AbstractAccountAuthenticator.java
@@ -77,7 +77,7 @@ public final Account getAccount() {
      *             if authentication failed (network error, bad credentials,
      *             etc...)
      */
-    protected final String generateAuthToken() throws HttpClientException {
+    protected final String generateAuthToken(String authTokenType) throws HttpClientException {
         // Get an authentication token from the AccountManager:
         // this call is asynchronous, as the user may not respond immediately.
         final AccountManager am = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
@@ -86,9 +86,9 @@ protected final String generateAuthToken() throws HttpClientException {
         // The AccountManager API for authentication token is different before
         // Ice Cream Sandwich.
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            authResultFuture = GetTokenLegacy.INSTANCE.get(am, account);
+            authResultFuture = GetTokenLegacy.INSTANCE.get(am, account, authTokenType);
         } else {
-            authResultFuture = GetTokenICS.INSTANCE.get(am, account);
+            authResultFuture = GetTokenICS.INSTANCE.get(am, account, authTokenType);
         }
 
         final Bundle authResult;
@@ -124,17 +124,17 @@ private static class GetTokenLegacy {
         public static final GetTokenLegacy INSTANCE = new GetTokenLegacy();
 
         @SuppressWarnings("deprecation")
-        public AccountManagerFuture<Bundle> get(AccountManager am, Account account) {
-            return am.getAuthToken(account, "ah", false, null, null);
+        public AccountManagerFuture<Bundle> get(AccountManager am, Account account, String authTokenType) {
+            return am.getAuthToken(account, authTokenType, false, null, null);
         }
     }
 
     private static class GetTokenICS {
         public static final GetTokenICS INSTANCE = new GetTokenICS();
 
         @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-        public AccountManagerFuture<Bundle> get(AccountManager am, Account account) {
-            return am.getAuthToken(account, "ah", null, false, null, null);
+        public AccountManagerFuture<Bundle> get(AccountManager am, Account account, String authTokenType) {
+            return am.getAuthToken(account, authTokenType, null, false, null, null);
         }
     }
 }
diff --git a/src/org/pixmob/httpclient/GoogleAppEngineAuthenticator.java b/src/org/pixmob/httpclient/GoogleAppEngineAuthenticator.java
@@ -101,6 +101,10 @@ private static String urlEncode(String str) {
         return encoded;
     }
 
+    private String generateAuthToken() throws HttpClientException {
+        return generateAuthToken("ah");
+    }
+
     @Override
     public void onRequest(HttpURLConnection conn) throws Exception {
         if (authCookieValue == null) {