merged dev and fixed conflicts

adal/build.gradle

@@ -1,9 +1,22 @@
-apply plugin: 'com.android.library'
-apply plugin: 'pmd'
-apply plugin: 'checkstyle'
-apply plugin: 'maven-publish'
+plugins {
+    id 'com.microsoft.identity.buildsystem' version '0.1.0'
+    id 'com.android.library'
+    id 'pmd'
+    id 'checkstyle'
+    id 'maven-publish'
+}
+
 apply from: 'versioning/version_tasks.gradle'
-apply plugin: 'maven'
+
+def desugarCode = false
+
+if(project.hasProperty("sugar")){
+    desugarCode = sugar.toBoolean()
+}
+
+buildSystem {
+    desugar = desugarCode
+}
 
 group = 'com.microsoft.aad'
 
@@ -31,14 +44,6 @@ allprojects {
     }
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-    }
-}
-
 android {
 
     compileOptions {
@@ -141,12 +146,13 @@ dependencies {
 
     // 'local' flavor dependencies
     localApi(project(":common")) {
-        transitive = false
+        transitive = true
     }
 
     snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.2.0', changing: true)
 
     // 'dist' flavor dependencies
+    //TODO: we will have to change transitive to true once common4j is published
     distApi("com.microsoft.identity:common:3.2.0") {
         transitive = false
     }

adal/src/androidTest/java/com/microsoft/aad/adal/PackageHelperTests.java

@@ -26,7 +26,6 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.Signature;
@@ -122,7 +121,7 @@ public void testGetCurrentSignatureForPackage() throws NameNotFoundException,
 
         MockedPackageInfo mockedPackageInfo = new MockedPackageInfo(new Signature[]{new Signature(mTestSignature)});
         final PackageHelper packageHelper = (PackageHelper) getInstance(mockContext);
-        String actual = packageHelper.getCurrentSignatureForPackage(mockedPackageInfo);
+        String actual = packageHelper.getCurrentSignatureForPackage(mockedPackageInfo.packageName);
 
         // assert
         assertEquals("should be same info", mTestTag, actual);

adal/src/main/java/com/microsoft/aad/adal/BasicWebViewClient.java

@@ -169,7 +169,15 @@ public void onReceivedError(@NonNull final WebView view,
     public void onReceivedError(@NonNull final WebView view,
                                 @NonNull final WebResourceRequest request,
                                 @NonNull WebResourceError error) {
-        sendErrorResponse(error.getErrorCode(), error.getDescription().toString());
+        final String methodName = "onReceivedError (23)";
+        final boolean isForMainFrame = request.isForMainFrame();
+
+        com.microsoft.identity.common.logging.Logger.warn(TAG + methodName, "WebResourceError - isForMainFrame? " + isForMainFrame);
+        com.microsoft.identity.common.logging.Logger.warnPII(TAG + methodName, "Failing url: " + request.getUrl());
+
+        if (isForMainFrame) {
+            sendErrorResponse(error.getErrorCode(), error.getDescription().toString());
+        }
     }
 
     private void sendErrorResponse(final int errorCode,

adal/src/main/java/com/microsoft/aad/adal/DefaultTokenCacheStore.java

@@ -30,6 +30,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
 import com.microsoft.identity.common.adal.internal.cache.StorageHelper;
 import com.microsoft.identity.common.adal.internal.util.StringExtensions;
 import com.microsoft.identity.common.internal.cache.SharedPreferencesFileManager;
@@ -46,6 +47,8 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
+import static com.microsoft.aad.adal.ADALError.ARGUMENT_EXCEPTION;
+
 /**
  * Store/Retrieve TokenCacheItem from SharedPreferencesFileManager.
  * SharedPreferencesFileManager saves items when it is committed in an atomic operation.
@@ -162,7 +165,11 @@ public TokenCacheItem getItem(String key) {
             json = null != json ? json : "";
             String decrypted = decrypt(key, json);
             if (decrypted != null) {
-                return mGson.fromJson(decrypted, TokenCacheItem.class);
+                try {
+                    return mGson.fromJson(decrypted, TokenCacheItem.class);
+                } catch (final JsonSyntaxException exception) {
+                    Logger.e(TAG, "Fail to parse Json. ", exception.getMessage(), ARGUMENT_EXCEPTION, exception);
+                }
             }
         }
 
@@ -227,8 +234,12 @@ public Iterator<TokenCacheItem> getAll() {
 
             final String decryptedValue = decrypt(tokenKey, tokenValue);
             if (decryptedValue != null) {
-                final TokenCacheItem tokenCacheItem = mGson.fromJson(decryptedValue, TokenCacheItem.class);
-                tokens.add(tokenCacheItem);
+                try {
+                    final TokenCacheItem tokenCacheItem = mGson.fromJson(decryptedValue, TokenCacheItem.class);
+                    tokens.add(tokenCacheItem);
+                } catch (final JsonSyntaxException exception) {
+                    Logger.e(TAG, "Fail to parse Json. ", exception.getMessage(), ARGUMENT_EXCEPTION, exception);
+                }
             }
         }
 

adal/src/main/java/com/microsoft/aad/adal/FileTokenCacheStore.java

@@ -47,7 +47,7 @@ public class FileTokenCacheStore implements ITokenCacheStore {
      */
     private static final long serialVersionUID = -8252291336171327870L;
 
-    private static final String TAG = null;
+    private static final String TAG = FileTokenCacheStore.class.getSimpleName();
 
     private final File mFile;
 

azure-pipelines/auth-client/instrumented-test.yml

@@ -0,0 +1,25 @@
+# File: azure-pipelines\auth-client\instrumented-test.yml
+# Description: Run instrumented test for ADAL in a docker container
+name: Instrumented Tests
+
+trigger:
+- main
+
+pool:
+ name: DockerBuildAgents
+
+resources:
+ repositories:
+ - repository: common
+   type: github
+   name: AzureAD/microsoft-authentication-library-common-for-android
+   ref: dev
+   endpoint: ANDROID_GITHUB
+
+jobs:
+- job: instrumentedTest
+  displayName: Instrumented Test ADAL
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/templates/steps/auth-client/docker-tasks.yml@common

azure-pipelines/maven-release/adal-maven-release.yml

@@ -0,0 +1,39 @@
+# File: azure-pipelines\maven-release\adal-maven-release.yml
+# Description: Publish adal to maven central (sonatype)
+# https://search.maven.org/search?q=g:com.microsoft.aad%20AND%20a:adal
+# Variable 'AdalVersion' was defined in the Variables tab
+# Variable: 'ENV_VSTS_MVN_ANDROIDADAL_USERNAME' was defined in the Variables tab
+# Variable: 'mvnAccessToken' was defined in the Variables tab
+# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
+name: $(date:yyyyMMdd)$(rev:.r)
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: master
+  - repository: common
+    type: github
+    name: AzureAD/microsoft-authentication-library-common-for-android
+    ref: pedroro/release-pipelines
+    endpoint: ANDROID_GITHUB
+
+jobs:
+- template: azure-pipelines/templates/steps/maven-release/maven-release-jobs.yml@common
+  parameters:
+    project: adal
+    projectVersion: $(AdalVersion)
+    checkoutSubmodules: recursive
+    envVstsMvnAndroidAccessTokenVar: ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN
+    gradleAssembleReleaseTask: adal:clean adal:assembleDist adal:javadocJar
+    gradleGeneratePomFiletask: adal:generatePomFileForAdalPublication
+    aarSourceFolder: C:\Temp\s\adal\outputs\aar
+    jarSourceFolder: C:\Temp\s\adal\outputs\jar
+    pomSourceFolder: C:\Temp\s\adal\publications\adal
+    gpgAar: true
+    gpgSourcesJar: true
+    gpgJavadocJar: true
+    gpgJar: false

azure-pipelines/pull-request-validation/pr-adal.yml

@@ -0,0 +1,52 @@
+# File: azure-pipelines\pull-request-validation\pr-adal.yml
+# Description: Assemble adal
+# Variable: 'ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME' was defined in the Variables tab
+# Variable: 'mvnAccessToken' was defined in the Variables tab
+# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
+name: $(date:yyyyMMdd)$(rev:.r)
+
+trigger:
+  branches:
+    include:
+    - dev
+    - master
+    - release/*
+  batch: True
+
+resources:
+  repositories:
+  - repository: common
+    type: github
+    name: AzureAD/microsoft-authentication-library-common-for-android
+    ref: dev
+    endpoint: ANDROID_GITHUB
+
+jobs:
+- job: Phase_1
+  displayName: Phase 1
+  cancelTimeoutInMinutes: 1
+  pool:
+    name: Hosted Windows 2019 with VS2019
+  steps:
+  - checkout: self
+    clean: true
+    submodules: recursive
+    persistCredentials: True
+  - template: azure-pipelines/templates/steps/credscan-policheck.yml@common
+    parameters:
+      policheckCmdLineArgsDir: adal
+  - template: azure-pipelines/templates/steps/automation-cert.yml@common
+  - task: Gradle@1
+    name: Gradle1
+    displayName: Assemble Release
+    inputs:
+      tasks: clean adal:assembleLocal
+      publishJUnitResults: false
+      jdkArchitecture: x86
+      sqAnalysisBreakBuildIfQualityGateFailed: false
+  - template: azure-pipelines/templates/steps/spotbugs.yml@common
+    parameters:
+      project: adal
+  - task: ComponentGovernanceComponentDetection@0
+    displayName: Component Detection
+...

azure-pipelines/vsts-releases/adal-vsts-release.yml

@@ -0,0 +1,55 @@
+# File: azure-pipelines\vsts-releases\adal-vsts-release.yml
+# Description: Publish adal to internal feed
+# https://identitydivision.visualstudio.com/Engineering/_packaging?_a=package&feed=AndroidADAL&package=com.microsoft.aad%3Aadal&protocolType=maven
+# Variable 'ENV_VSTS_MVN_ANDROIDADAL_USERNAME' was defined in the Variables tab
+# Variable 'mvnAccessToken' was defined in the Variables tab
+# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
+name: $(date:yyyyMMdd)$(rev:.r)
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: master
+  - repository: common
+    type: github
+    name: AzureAD/microsoft-authentication-library-common-for-android
+    ref: dev
+    endpoint: ANDROID_GITHUB
+
+jobs:
+- job: Phase_1
+  displayName: Phase 1
+  cancelTimeoutInMinutes: 1
+  pool:
+    name: Hosted Windows 2019 with VS2019
+  steps:
+  - checkout: self
+    clean: true
+    submodules: recursive
+    persistCredentials: True
+  - task: CmdLine@1
+    displayName: Set MVN Access Token in Environment
+    inputs:
+      filename: echo
+      arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN]$(mvnAccessToken)'
+  - template: azure-pipelines/templates/steps/credscan-policheck.yml@common
+    parameters:
+      policheckCmdLineArgsDir: adal
+  - task: Gradle@1
+    name: Gradle1
+    displayName: Assemble Release
+    inputs:
+      tasks: clean adal:assembleDist
+      publishJUnitResults: false
+      jdkArchitecture: x86
+      sqAnalysisBreakBuildIfQualityGateFailed: false
+  - task: Gradle@2
+    displayName: Publish to VSTS
+    inputs:
+      tasks: adal:publish
+      publishJUnitResults: false
+...

changelog.txt

@@ -1,12 +1,14 @@
 v.Next
 ----------
+- [PATCH] Fixes crash due to missing exception handling. (#1606)
 - [PATCH] Adds API23 WebViewClient#onReceivedError overload (#1580)
 - [PATCH] Fixes for MFA setup using Authenticator app.(#1579)
 - [MINOR] Changes to Broker Validation to allow setting whether to trust debug brokers (prod brokers are always trusted).
 - [PATCH] Replaced deprecated PackageInfo.versionCode with PackageInfoCompat.getLongVersionCode(packageInfo) (#1584)
 - [PATCH] Fixes deprecated PackageInfo.signatures (#1587)
 - [PATCH] Deprecated ADAL namespaced AuthenticationSettings#setSecretKey(), #getSecretKey() (#1586)
-- Picks up [email protected]
+- [PATCH] Disregard pageload errors for the non-primary frame during interactive auth (#1603)
+- [PATCH] Updates Nimbus version 8.2 -> 9.9 (#1600)
 
 Version 3.1.2
 -------------