Merge pull request #1008 from AzureAD/release/1.4.1

Merge release/1.4.1 to master
AzureAD · Apr 17, 2020 · 097a3f2 · 097a3f2
2 parents d5ca755 + 7a7f9e0
commit 097a3f2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/changelog b/changelog
@@ -1,5 +1,12 @@
 MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
 
+Version 1.4.1
+- Hotfix release for Teams Dog Food.
+- Fixes #1005
+- Fixes common #871
+- Limit silent thread pool to 5 threads.
+- Picks up [email protected]
+
 Version 1.4.0
 - Fix for MSAL #920, 924, 935, 940
     * Crash due to error receiving CANCEL broadcast

diff --git a/common b/common
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -144,9 +144,9 @@ dependencies {
         transitive = false
     }
 
-    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.0.2', changing: true)
+    snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '2.0.2-hf1', changing: true)
 
-    distApi("com.microsoft.identity:common:2.0.2") {
+    distApi("com.microsoft.identity:common:2.0.2-hf1") {
         transitive = false
     }
 }

diff --git a/msal/src/main/java/com/microsoft/identity/client/MultipleAccountPublicClientApplication.java b/msal/src/main/java/com/microsoft/identity/client/MultipleAccountPublicClientApplication.java
@@ -29,6 +29,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.microsoft.identity.client.exception.MsalArgumentException;
 import com.microsoft.identity.client.exception.MsalClientException;
 import com.microsoft.identity.client.exception.MsalException;
 import com.microsoft.identity.client.internal.AsyncResult;
@@ -61,6 +62,7 @@
 import java.util.Map;
 
 import static com.microsoft.identity.client.internal.MsalUtils.throwOnMainThread;
+import static com.microsoft.identity.client.internal.MsalUtils.validateNonNullArg;
 
 public class MultipleAccountPublicClientApplication extends PublicClientApplication
         implements IMultipleAccountPublicClientApplication {
@@ -249,6 +251,16 @@ public void getAccount(@NonNull final String identifier,
     private void getAccountInternal(@NonNull final String identifier,
                                     @NonNull final GetAccountCallback callback,
                                     @NonNull final String publicApiId) {
+
+        if(callback == null){
+            throw new IllegalArgumentException("callback cannot be null or empty");
+        }
+        try {
+            validateNonNullArg(identifier, "identifier");
+        } catch (MsalArgumentException e) {
+            callback.onError(e);
+        }
+
         final String methodName = ":getAccount";
 
         com.microsoft.identity.common.internal.logging.Logger.verbose(

diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=1.4.0
+versionName=1.4.1
 versionCode=0
+5 −0		changelog.txt
+134 −0		common/src/androidTest/java/com/microsoft/identity/common/MicrosoftFamilyOAuth2TokenCacheTest.java
+9 −10		common/src/main/java/com/microsoft/identity/common/internal/cache/MicrosoftFamilyOAuth2TokenCache.java
+2 −1		common/src/main/java/com/microsoft/identity/common/internal/controllers/CommandDispatcher.java
+1 −1		common/versioning/version.properties