Merge pull request #361 from CAAPIM/develop

MAS 2.1.00 final release merge

Author: manutripathi82

.gitmodules

@@ -2,10 +2,3 @@
 	path = MASUnit
 	url = https://github.com/CAAPIM/Android-MAS-Unit.git
 	branch = develop
-[submodule "Knox"]
-	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

ChangeLog.md

@@ -1,3 +1,21 @@
+# Version 2.1.00
+
+### Bug fixes
+- None
+
+### New features
+- Handling of Android's Doze Mode. [US632023]
+- Migration to AndroidX. [US646346]
+- Dependency libraries update [US469994]
+    - com.nimbusds:nimbus-jose-jwt to 8.6
+    - com.google.zxing:core to 3.4.0
+    - org.bouncycastle:bcpkix-jdk15on to 1.64
+
+### Deprecated/Removed
+- Removed mas-identity module.
+- Removed user-to-user messaging related classes/interfaces from mas-connecta.
+- Cloud storage related classes/interfaces are removed.
+
 # Version 2.0.00
 
 ### Bug fixes
@@ -214,11 +232,8 @@
 
 - Deprecated some redundant methods in MASGroupIdentity, these methods are redundant with getGroupByFilter(). [MCT-503]
 
- [mag]: https://docops.ca.com/mag
- [mas.ca.com]: http://mas.ca.com/
- [docs]: http://mas.ca.com/docs/
- [blog]: http://mas.ca.com/blog/
-
+ [mag]: https://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-api-gateway/4-2.html
+ [docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-1.html
  [releases]: ../../releases
  [contributing]: /CONTRIBUTING.md
  [license-link]: /LICENSE

Knox

@@ -6,18 +6,17 @@ CA Mobile API Gateway (MAG) provides enterprises with a secure mobile backend th
 The CA Mobile API Gateway also provides powerful mobile backend services through SDKs and APIs for developers to help accelerate the app development process.
 
 ## Get Started
-Check out our [documentation][documentation] for sample code, video tutorials, and more.  
+Check out our [documentation] for sample code and more.
 
 ## Android Mobile SDK Frameworks
 The Android Mobile SDK consists of these frameworks:
 
-- **MASConnecta** - Messaging and pub/sub services allowing users to message and send data to each other.
+- **MASConnecta** - Pub/Sub messagin service.
 - **MASFoundation** - Core services to handle user authentication, device and app registration, requests and local storage of certificates, keys, and token credentials for accessing protected APIs.
-- **MASIdentityManagement** - Identity management services to securely access users and groups from enterprise identity providers.
-- **MASStorage** - Storage services for private local and cloud storage.
+- **MASStorage** - Storage services for private local storage.
 - **MASUI** - Resources to implement a user login dialog, Social Login, One-Time Password, and Proximity Login (QR code and BLE).
 
-For more information about our mobile products see the [developer website](http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.html).
+For more information about our mobile products see the [developer website](http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-1.html).
 
 ## Features
 
@@ -28,9 +27,6 @@ For more information about our mobile products see the [developer website](http:
 * **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.
@@ -40,14 +36,13 @@ For more information about our mobile products see the [developer website](http:
 Edit your build.gradle file and add below dependency:
 ```gradle
     dependencies {
-        implementation 'com.ca:mas-foundation:2.0.00'
+        implementation 'com.ca:mas-foundation:2.1.00'
 
-        implementation 'com.ca:mas-connecta:2.0.00' // (Optional) Only required when using mas connecta
-        implementation 'com.ca:mas-storage:2.0.00' // (Optional) Only required when using mas storage
-        implementation 'com.ca:mas-identity-management:2.0.00' // (Optional) Only required when using mas identity management
-        implementation 'com.ca:masui:2.0.00' // (Optional) Only required when using MASUI Template. The MAS UI library provides sample user interfaces for Login, OTP, Social Login, and Enterprise Browser.
+        implementation 'com.ca:mas-connecta:2.1.00' // (Optional) Only required when using mas connecta
+        implementation 'com.ca:mas-storage:2.1.00' // (Optional) Only required when using mas storage
+        implementation 'com.ca:masui:2.1.00' // (Optional) Only required when using MASUI Template. The MAS UI library provides sample user interfaces for Login, OTP, Social Login, and Enterprise Browser.
 
-        implementation 'org.bouncycastle:bcpkix-jdk15on:1.59' // (Optional) Only required when you want to support Android 4.1.x
+        implementation 'org.bouncycastle:bcpkix-jdk15on:1.64' // (Optional) Only required when you want to support Android 4.1.x
     }
 ```
 ## SDK Releases
@@ -59,9 +54,7 @@ The compiled release binaries can be found here: [Releases][Releases]
 - [Sample-App-MAS-Android-Access-API-Geolocation-And-OTP](https://github.com/CAAPIM/Sample-App-MAS-Android-Access-API-Geolocation-And-OTP)
 - [Sample-App-MAS-Android-Fingerprint-Sessions-Lock](https://github.com/CAAPIM/Sample-App-MAS-Android-Fingerprint-Sessions-Lock)
 - [Sample-App-MAS-Android-Login-User-Authentication-And-Authorization](https://github.com/CAAPIM/Sample-App-MAS-Android-Login-User-Authentication-And-Authorization)
-- [Sample-App-MAS-Android-Messaging](https://github.com/CAAPIM/Sample-App-MAS-Android-Messaging)
-- [Sample-App-MAS-Android-Secure-Cloud-And-Local-Storage](https://github.com/CAAPIM/Sample-App-MAS-Android-Secure-Cloud-And-Local-Storage)
-- [Sample-App-MAS-Android-User-Group-Management](https://github.com/CAAPIM/Sample-App-MAS-Android-User-Group-Management)
+- [Sample-App-MAS-Android-Secure-Local-Storage](https://github.com/CAAPIM/Sample-App-MAS-Android-Secure-Local-Storage)
 
 ## Communication
 - *Have general questions or need help?*, use [Stack Overflow][StackOverflow]. (Tag 'massdk')
@@ -81,10 +74,10 @@ The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 This software may be modified and distributed under the terms
 of the MIT license. See the [LICENSE][license-link] file for details.
 
-[docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.html
+[docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-1.html
 [StackOverflow]: http://stackoverflow.com/questions/tagged/massdk
 [issues]: https://github.com/CAAPIM/Android-MAS-SDK/issues
 [releases]: ../../releases
 [contributing]: /CONTRIBUTING.md
 [license-link]: /LICENSE
-[documentation]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.html
+[documentation]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-1.html

MASUnit

@@ -34,14 +34,14 @@ ext {
     buildToolsVersion = '29.0.2'
     compileSdkVersion = 29
     gcm = '12.0.1'
-    minSdkVersion = 16
-    nimbusJoseVersion = '6.0.2'
+    minSdkVersion = 19
+    nimbusJoseVersion = '8.6'
     targetSdkVersion = 29
-    versionCode = 23
-    versionName = '2.0.00'
-    zxingVersion = '3.3.0'
+    versionCode = 24
+    versionName = '2.1.00'
+    zxingVersion = '3.4.0'
     testRunner = '1.0.1'
     testRules = '1.0.1'
-    bcpVersion = '1.59'
+    bcpVersion = '1.64'
     coverageEnabled = false
 }

README.md

@@ -32,4 +32,6 @@ 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'
+issueUrl = 'https://github.com/CAAPIM/Android-MAS-SDK/issues'
+android.useAndroidX=true
+android.enableJetifier=true

build.gradle

@@ -19,7 +19,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
 
@@ -97,7 +97,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: "connectedDebugAndroidTest"
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(':mas-foundation')
-    api "com.android.support:appcompat-v7:$rootProject.ext.supportLibsVersion"
+    api 'androidx.appcompat:appcompat:1.0.0'
 
     api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
     api 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'

fido

@@ -8,7 +8,7 @@
 package com.ca.mas.messaging;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import android.util.Base64;
 
 import com.ca.mas.MASLoginTestBase;
@@ -167,9 +167,14 @@ public void testCreateJSONStringFromNewMASMessageWithDefaultAttributes() throws
             String jsonString = mMessage.createJSONStringFromMASMessage(getContext());
             JSONObject jsonObject = new JSONObject(jsonString);
             assertEquals(jsonObject.getString(MessagingConsts.KEY_VERSION), "1.0");
-            assertEquals(jsonObject.getString(MessagingConsts.KEY_SENDER_ID), mSenderId);
+            try {
+                assertEquals(jsonObject.getString(MessagingConsts.KEY_SENDER_ID), mSenderId);
+                assertEquals(jsonObject.getString(MessagingConsts.KEY_DISPLAY_NAME), mDisplayName);
+            } catch (JSONException e){
+                //Ignore if sender id is missing in jsonObject
+            }
             assertEquals(jsonObject.getString(MessagingConsts.KEY_SENDER_TYPE), mSenderType.toUpperCase());
-            assertEquals(jsonObject.getString(MessagingConsts.KEY_DISPLAY_NAME), mDisplayName);
+
             long sentTime = jsonObject.getLong(MessagingConsts.KEY_SENT_TIME);
             assertTrue(startTime <= sentTime && sentTime <= System.currentTimeMillis());
             assertEquals(jsonObject.getString(MessagingConsts.KEY_CONTENT_TYPE), MessagingConsts.DEFAULT_TEXT_PLAIN_CONTENT_TYPE);
@@ -195,9 +200,13 @@ public void testCreateJSONStringFromNewMASMessageWithEmptyAttributes() throws Ex
             String jsonString = mMessage.createJSONStringFromMASMessage(getContext());
             JSONObject jsonObject = new JSONObject(jsonString);
             assertEquals(jsonObject.getString(MessagingConsts.KEY_VERSION), "1.0");
-            assertEquals(jsonObject.getString(MessagingConsts.KEY_SENDER_ID), mSenderId);
+            try {
+                assertEquals(jsonObject.getString(MessagingConsts.KEY_SENDER_ID), mSenderId);
+                assertEquals(jsonObject.getString(MessagingConsts.KEY_DISPLAY_NAME), mDisplayName);
+            } catch (JSONException e){
+                //Ignore if sender id is missing in jsonObject
+            }
             assertEquals(jsonObject.getString(MessagingConsts.KEY_SENDER_TYPE), mSenderType.toUpperCase());
-            assertEquals(jsonObject.getString(MessagingConsts.KEY_DISPLAY_NAME), mDisplayName);
             long sentTime = jsonObject.getLong(MessagingConsts.KEY_SENT_TIME);
             assertTrue(startTime <= sentTime && sentTime <= System.currentTimeMillis());
             assertEquals(jsonObject.getString(MessagingConsts.KEY_CONTENT_TYPE), MessagingConsts.DEFAULT_TEXT_PLAIN_CONTENT_TYPE);