Merge branch 'develop'

* develop: (156 commits)
  Update with removed interface and resource files
  Updated to 1.4.00 and minor edits for clarity
  [US324509] - Update MAS Version from 4.0.00 to 1.4.00
  US322780 - Update change log and mark MASSocialLogin as deprecated.
  US322780 - Update change log
  DE284027 - Support TLS 1.1/1.2 for Android 4.4 on MQTT TLS
  DE284027 - Only use TLS for API connection.
  DE284027 - Only use TLS for API connection.
  DE284027 - Only use TLS for API connection.
  DE284027 - Support TLS 1.1 and 1.2 for Android 4.4
  DE284052 - Unbind connecta service after disconnected from MQTT.
  Updating version code and name to reflect the 4.0 release
  [DE283744] Removing name overriding based off identifier name due to LinkedIn
  [DE283744] NFC/Bluetooth menu is disabled when qrcode provider is disabled, buttons changed to two column layout
  DE283246 - When failed to parse the MQTTMessage to MASMessage, provide the raw message to developer.
  [DE282393] Session locking with no ID token now clears access and refresh tokens after retrieving the ID token
  [DE282393] Session locking with no ID token will no longer clear access and refresh tokens first
  Small refactor for MASLoginTestBase
  US317989 -Add more unit test for mas module
  [DE282374] - Trigger server switch for port changed.
  ...

# Conflicts:
#	mas/src/main/java/com/ca/mas/foundation/MAS.java

Author: BobbyWeber

.gitmodules

@@ -6,3 +6,6 @@
 	path = Knox
 	url = https://github.com/CAAPIM/Android-MAS-Knox.git
 	branch = develop
+[submodule "fido"]
+	path = fido
+	url = https://github.com/CAAPIM/Android-MAS-FIDO

CONTRIBUTING.md

@@ -15,7 +15,7 @@ Follow these steps for pull requests:
 
 1. Fork the repo and create your branch from `master`.
 4. For any new code, add unit tests.
-3. If you've changed APIs, update code comments for AppleDocs.
+3. If you've changed APIs, update code comments for JavaDocs.
 4. Verify that the test suite passes.
 5. Verify that your code follows the [Code Standard Guideline][guidelines]
 6. If you haven't already, complete the [Contributor License Agreement ("CLA")][cla].

ChangeLog.md

@@ -1,3 +1,36 @@
+# Version 1.4.00
+
+### Bug fixes
+- Populate MASUser.getEmailList() from SCIM interface [DE277223]
+- Include server prefix in MQTT topic structure. [DE269619]
+- Remove auto pagination for Group and User management [DE275216]
+- TLS1.1 and 1.2 support for Android 4.4 [DE284027]
+
+
+### New features
+- Introduces new way of dynamically initializing SDK with enrollment URL. With this feature, an application or system administrator can generate an URL specified to a user, so that the user can initialize SDK without having an application with built in `msso_config.json` deployed with the application. Server configuration and application level implementation is required. [US279237]
+- Introduces new way of performing social login through SDK.  SDK now performs social login with `CustomTabs` to ensure better security, and adopts a modern way of performing OAuth web authentication. [US273008]
+- Introduces new protection on authorization process with Proof Key for Code Exchange by OAuth Public Clients.  By default, PKCE process is enabled, and it can be disabled; however, it is strongly recommended to not disable it unless there is a specific use case. [US269512]
+- Adds JCenter integration so developers can use dependency manager to install Mobile SDK. [US279239]
+- Provides callback with error details when MASRequest is canceled. [US253874]
+- Minimizes the number of permissions requested by the Mobile SDK. [US285971]
+- Removes Spongy Castle dependency. [US238965]
+- Introduces new way of performing user login. MASUser.login(MASIdToken idToken, final MASCallback<MASUser> callback) [US308531]
+- Adds new attribute on MASRequestBuilder that allows access to unprotected endpoint on the Gateway.  [US308531]
+
+### Deprecated Methods
+- `MASSocialLogin` class is deprecated. Please use `MASCustomTabs` to display social login web URL from `MASAuthenticationProvider` and use `MASAuthorizationResponse` class to handle incoming response from `CustomTabs`. [US279228]
+- `MASLoginFragment` login template has been removed. Please use `MASLoginActivity` to display the Login Dialog.  [US279228]
+- `MASFilteredRequestBuilder.setTotalResults` has been removed.  Please use `setPagination` to handle result pagination. [DE275216]
+- Resource files `xml/prefs.xml` and `xml/authenticator_ca_mas.xml` are removed from the Mobile SDK. [DE265344]
+
+
+# Version 1.3.00-CR1
+
+### Bug fixes
+- Remove default WebViewClient onReceivedSslError implementation . [DE247887]
+- Allow developer to overwrite the authenticator_ca_mas setting for AMS. [DE265344]
+
 # Version 1.3
 
 ### Bug fixes

README.md

@@ -1,19 +1,58 @@
 # Android Mobile SDK
-## for CA Mobile App Services and CA Mobile API Gateway
+CA Mobile API Gateway provides enterprises with a secure mobile backend that integrates systems and allows control over which users, devices and applications can access your APIs. The gateway enables developers to leverage standards for API security such as (OAuth2, OpenID Connect, PKI) through client SDKs for Android.
+
+CA Mobile App Services is an extension of the CA Mobile API Gateway which provides powerful features through SDKs and APIs for developers to help accelerate the app development process.
+
+The SDK consists of these frameworks:
+* **mag** - Handles user authentication, device and app registration, requests and local storage of certificates, keys, and token credentials for accessing the protected APIs.
+* **mas** - Messaging and Pub/Sub, Identity Management, and Storage services.
+* **masui** - Resources to implement a user login dialog, Social Login, One-Time Password, and Proximity Login (QR code and BLE).
 
-## Overview
-The Android Mobile SDK gives developers simple and secure access to the services of CA Mobile API Gateway and CA Mobile App Services. 
 For more information about our mobile products see [the website][mas.ca.com].
 
+## Features
+
+* **Secure API Calls** - *Protect APIs with Mutual TLS and control API access on application, user and device level.*
+* **Authentication** - *Implement authentication with username/password, Facebook, Google, Twitter sign-in.*
+* **Second Factor Auth** - *Secure critical APIs with One Time Password.*
+* **Single Sign-On** -*Share user credentials between your apps.*
+* **Enterprise Browser** - *Extend the single sign-on session to web applications.*
+* **Proximity Login** - *Transfer the user session between devices and platforms.*
+* **Fingerprint Sessions Lock** - *Support phone unlocking using fingerprint recognition.*
+* **Messaging** - *Create collaborative apps with secure, reliable messaging.*
+* **User Management** - *Seamlessly integrate your app with an existing enterprise user directory.*
+* **Private Cloud Storage** - *Store data in a private cloud and access it from all of your devices.*
+* **Pub/Sub** - *Create real-time, IoT-friendly apps using an MQTT-based Pub/Sub infrastructure.*
+* **Adhoc Groups** - *Create groups on-the-fly for collaborative apps.*
+* **Local Storage** - *Store data on devices with enterprise-grade encryption.*
+* **UI Template** - *Provides resources to implement a user login dialog, Social Login, One-Time Password, and Proximity Login (QR code and BLE), to save time during UI creation and app prototyping.*
+
+
 ## Get Started
-Follow our step-by-step guide to [get started][get-started].
+* Read the "[Getting Started][get-started]" guide or watch some [video tutorials][video].
+* Check out our [documentation][documentation] for more details and sample code.
 
-## How You Can Contribute
 
+## Communication
+* Have general questions, need help, or have an idea and want to request a feature? Open an [issue][issues].
+* Find a bug? Open an [issue][issues] with the steps to reproduce it.
+
+## Installation
+Edit your build.gradle file and add below dependency:
+```gradle
+    dependencies {
+        compile 'com.ca:mas:1.3.01'
+        compile 'com.ca:masui:1.3.01' //Only requires when using MASUI Template
+    }
+```
+
+## How You Can Contribute
 Contributions are welcome and much appreciated. To learn more, see the [Contribution Guidelines][contributing].
 
-## License
+## Documentation
+For more documentation and API references, go to our [main website][documentation].
 
+## License
 Copyright (c) 2016 CA. All rights reserved.
 
 This software may be modified and distributed under the terms
@@ -25,6 +64,9 @@ of the MIT license. See the [LICENSE][license-link] file for details.
  [blog]: http://mas.ca.com/blog/
  [get-started]: http://mas.ca.com/get-started
 
+ [issues]: https://github.com/CAAPIM/Android-MAS-SDK/issues
  [releases]: ../../releases
  [contributing]: /CONTRIBUTING.md
  [license-link]: /LICENSE
+ [video]: https://www.ca.com/us/developers/mas/videos.html
+ [documentation]: https://www.ca.com/us/developers/mas/docs.html

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
@@ -26,3 +26,18 @@ allprojects {
     }
 }
 
+ext {
+    appAuthVersion = '0.5.0'
+    appCompatVersion = '25.1.0'
+    buildToolsVersion = '25.0.2'
+    compileSdkVersion = 25
+    designVersion = '25.1.0'
+    gridLayoutVersion = '25.1.0'
+    minSdkVersion = 19
+    recyclerViewVersion = '25.1.0'
+    supportAnnotationsVersion = '25.1.0'
+    targetSdkVersion = 25
+    versionCode = 14
+    versionName = '1.4.00'
+    zxingVersion = '3.2.0'
+}

fido

@@ -26,4 +26,10 @@
 # org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4096M
 bintray_user=
-bintray_api_key=
+bintray_api_key=
+mag_version=
+mas_version=
+
+siteUrl = 'https://www.ca.com/us/developers/mas.html'
+gitUrl = 'https://github.com/CAAPIM/Android-MAS-SDK.git'
+issueUrl = 'https://github.com/CAAPIM/Android-MAS-SDK/issues'

gradle.properties

@@ -11,18 +11,18 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     lintOptions {
         abortOnError false
     }
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 24
-        versionCode 33
-        versionName "3.3"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 40
+        versionName "4.0.00"
     }
     buildTypes {
         release {
@@ -57,25 +57,18 @@ task javadoc(type: Javadoc) {
     include '**/MAGResponseBody.java'
 
     exclude '**/BluetoothLePeripheral.java'
-
 }
 
 dependencies {
-
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.madgag:scprov-jdk15on:1.47.0.3'
-    compile 'com.android.support:support-annotations:24.2.1'
-    compile 'com.google.zxing:core:3.2.0'
+    compile "com.android.support:support-annotations:$rootProject.ext.supportAnnotationsVersion"
+    compile "com.google.zxing:core:$rootProject.ext.zxingVersion"
 }
 
 //jcenter integration
-def siteUrl = 'https://github.com/CAAPIM/Android-MAS-SDK'
-def gitUrl = 'https://github.com/CAAPIM/Android-MAS-SDK.git'
-def issueUrl = 'https://github.com/CAAPIM/Android-MAS-SDK/issues'
-
 group 'com.ca'
 
-project.version = "3.3"
+project.version = mag_version
 bintray {
     user = bintray_user
     key = bintray_api_key
@@ -85,7 +78,7 @@ bintray {
         repo = 'maven'
         name = 'mag'
         userOrg = 'caapim'
-        desc = 'CA Mobile API Gateway provides enterprises with a secure mobile backend that integrates systems and allows control over which users, devices and applications can access your APIs. The gateway enables developers to leverage standards for API security such as (OAuth2, OpenID Connect, PKI) through client SDKs for Android and iOS.'
+        desc = 'SDK to support the CA Mobile API Gateway and CA Mobile App Services.'
         websiteUrl = siteUrl
         issueTrackerUrl = issueUrl
         vcsUrl = gitUrl

mag/build.gradle

@@ -9,13 +9,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.ca.mas.core.test"
-        minSdkVersion 16
-        targetSdkVersion 24
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
 
@@ -35,10 +35,10 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile "com.android.support:appcompat-v7:$rootProject.ext.appCompatVersion"
     androidTestCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
 
-    androidTestCompile 'com.android.support:support-annotations:24.2.1'
+    androidTestCompile "com.android.support:support-annotations:$rootProject.ext.supportAnnotationsVersion"
     androidTestCompile 'com.android.support.test:runner:0.3'
     androidTestCompile 'com.android.support.test:rules:0.3'