Merge pull request #47 from webex/Release/2.7.0

Release/2.7.0
webex · Dec 11, 2020 · 67ad41a · 67ad41a
2 parents a1dd5d4 + d204f9d
commit 67ad41a
Show file tree

Hide file tree

Showing 251 changed files with 1,806 additions and 379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,4 +55,7 @@ freeline_project_description.json
 .project
 .settings/
 .vscode
-.classpath
+.classpath
+
+# Filies under deps
+deps/*.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+#### 2.7.0 Releases
+- `2.7.0` Releases - [2.7.0](#270)
+
 #### 2.6.0 Releases
 - `2.6.0` Releases - [2.6.0](#260)
 
@@ -32,6 +35,20 @@ All notable changes to this project will be documented in this file.
 - `0.2.0` Releases - [0.2.0](#020)
 
 ---
+## [2.7.0](https://github.com/webex/webex-android-sdk/releases/tag/2.7.0)
+Released on 2020-12-14.
+#### Added
+- Support to notify a space call status through SpaceObserver
+- Support to notify muted by host during a space call.
+- Support to enable audio Background Noise Removal(BNR), and switch between HP(High Performance) and LP(Low Power) mode.
+- Not sending sensitive headers for unknown site.
+- Add a new API `Phone.setAdvancedSetting(new ShareMaxCaptureFPS(Int))` to change the max capture fps when screen sharing.
+- Add a new API `Call.switchAudioOutput(AudioOutputMode audioOutputMode)` to switch the audio play output mode during a call.
+
+#### Updated
+- Fixed users required to activate H.264 multiple times.
+- Fixed SpaceClient.listWithActiveCalls() cannot show spaces cross-cluster.
+
 ## [2.6.0](https://github.com/webex/webex-android-sdk/releases/tag/2.6.0)
 Released on 2020-09-28.
 #### Added

diff --git a/LICENSE b/LICENSE
@@ -4,7 +4,7 @@ Everything else is licensed under MIT License below.
 
 MIT License
 
-Copyright (c) 2016-2020 Cisco Systems, Inc.
+Copyright (c) 2016-2021 Cisco Systems, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Assuming you already have an Android project, e.g. _MyWebexApp_, for your Androi
 
     ```groovy
     dependencies { 
-        compile('com.ciscowebex:androidsdk:2.6.0@aar', {
+        compile('com.ciscowebex:androidsdk:2.7.0@aar', {
             transitive = true
         })
     }
@@ -312,44 +312,44 @@ Here are some examples of how to use the Android SDK in your app.
 10. Post a message
 
     ```java
-    webex.message().postToPerson(
-        EmailAddress.fromString("[email protected]"), 
-        Message.Text.markdown("**Hello**", "<strong>Hello</strong>", "Hello"), 
-        files,
-        new CompletionHandler<Message>() {
-            @Override
-            public void onComplete(Result<Message> result) {
-                if (result.isSuccessful()) {
-                    // message sent success
+    webex.message().post(
+                targetId,
+                Message.draft(Message.Text.markdown("**Hello**", "<strong>Hello</strong>", "Hello"))
+                .addAttachments(localFile),
+                new CompletionHandler<Message>() {
+                    @Override
+                    public void onComplete(Result<Message> result) {
+                        if (result.isSuccessful()) {
+                            // message sent success
                     ...
-                } else {
-                    // message sent failed
+                        } else {
+                            // message sent failed
                     ...
-                }
-            }
-        }));
+                        }
+                    }
+                });
     ```
     
 11. Post a threaded message
 
     ```java
-    webex.message().postToPerson(
-        EmailAddress.fromString("[email protected]"), 
-        Message.Text.markdown("**Hello**", "<strong>Hello</strong>", "Hello"), 
-        files,
-        parentMessage,
-        new CompletionHandler<Message>() {
-            @Override
-            public void onComplete(Result<Message> result) {
-                if (result.isSuccessful()) {
-                    // message sent success
+    webex.message().post(
+                targetId,
+                Message.draft(Message.Text.markdown("**Hello**", "<strong>Hello</strong>", "Hello"))
+                .addAttachments(localFile)
+                .setParent(parentMessage),
+                new CompletionHandler<Message>() {
+                    @Override
+                    public void onComplete(Result<Message> result) {
+                        if (result.isSuccessful()) {
+                            // message sent success
                     ...
-                } else {
-                    // message sent failed
+                        } else {
+                            // message sent failed
                     ...
-                }
-            }
-        }));
+                        }
+                    }
+                });
     ```
 
 12. Receive a message
@@ -545,6 +545,27 @@ Here are some examples of how to use the Android SDK in your app.
     ```java
     message.getMentions()
     ```
+28. Change the max capture fps when screen sharing
+
+    ```java
+    webex.phone().setAdvancedSetting(new ShareMaxCaptureFPS(int value));
+    ```
+29. Switch the audio play output mode during a call
+
+    ```java
+    activeCall.switchAudioOutput(AudioOutputMode audioOutputMode);
+    ```
+
+30. Enable Background Noise Removal(BNR)
+
+    ```java
+    webex.phone().enableAudioBNR(boolean enable);
+    ```
+31. Set Background Noise Removal(BNR) mode
+
+    ```java
+    webex.phone().setAudioBNRMode(Phone.AudioBRNMode mode);
+    ```
     
 ## Migrating from Cisco Spark Android SDK
 
@@ -598,6 +619,6 @@ Pull requests welcome. To suggest changes to the SDK, please fork this repositor
 
 ## License
 
-&copy; 2016-2020 Cisco Systems, Inc. and/or its affiliates. All Rights Reserved.
+&copy; 2016-2021 Cisco Systems, Inc. and/or its affiliates. All Rights Reserved.
 
 See [LICENSE](https://github.com/webex/webex-android-sdk/blob/master/LICENSE) for details.
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -9,8 +9,8 @@ ext {
     moduleName = 'Cisco Webex Android SDK'
     moduleGroupId = 'com.ciscowebex'
     moduleArtifactId = 'androidsdk'
-    moduleVersion = '2.6.0'
-    moduleVersionCode = 26026
+    moduleVersion = '2.7.0'
+    moduleVersionCode = 27005
     moduleDescription = 'Cisco Webex SDK for Android'
     moduleSiteUrl = 'https://developer.webex.com/docs/sdks/android'
     moduleProjectUrl = 'https://github.com/webex/webex-android-sdk'
@@ -24,6 +24,8 @@ ext {
     moduleDeveloperEmail = '[email protected]'
     moduleDeveloperOrganization = 'Cisco System Inc'
     moduleDeveloperOrganizationURL = 'https://www.webex.com/'
+
+    moduleWMEVersion = '10.12.2.0'
 }
 
 Properties properties = new Properties()
@@ -180,6 +182,41 @@ publishing {
                 }
             }
         }
+
+        WME(MavenPublication) {
+            groupId "com.webex"
+            artifactId "wme4android-release"
+            version moduleWMEVersion
+            artifact rootDir.absolutePath + '/deps/wme4android-release-' + moduleWMEVersion + '.aar'
+            pom.withXml {
+                asNode().appendNode('description', 'Cisco Webex Media Engine')
+                asNode().appendNode('name', 'Cisco Webex Media Engine')
+                asNode().children().last() + {
+                    resolveStrategy = DELEGATE_FIRST
+                    url moduleSiteUrl
+                    scm {
+                        url moduleGitUrl
+                        connection moduleConnectionUrl
+                        developerConnection moduleDeveloperConnectionUrl
+                    }
+                    licenses {
+                        license {
+                            name 'Commercial'
+                            url 'https://www.cisco.com/c/en/us/products/end-user-license-agreement.html'
+                        }
+                    }
+                    developers {
+                        developer {
+                            id moduleDeveloperId
+                            name moduleDeveloperName
+                            email moduleDeveloperEmail
+                            organization moduleDeveloperOrganization
+                            organizationUrl 'https://www.webex.com/products/teams/'
+                        }
+                    }
+                }
+            }
+        }
     }
 
     repositories {
@@ -205,7 +242,7 @@ publishing {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.webex:wme4android-release:10.8.5.0@aar'
+    implementation "com.webex:wme4android-release:$moduleWMEVersion@aar"
     implementation 'com.google.code.gson:gson:2.7'
     implementation 'com.github.benoitdion.ln:ln:0.1.2'
     implementation 'com.squareup.okhttp3:okhttp:3.12.0'
@@ -268,7 +305,7 @@ task javadoc(type: Javadoc) {
     options.docTitle(moduleName + ' ' + moduleVersion)
     options.links("http://docs.oracle.com/javase/7/docs/api/");
     options.links("http://d.android.com/reference/");
-    options.footer('Copyright &#169; 2016&#8211;2020 Cisco System Inc.  All Rights Reserved.')
+    options.footer('Copyright &#169; 2016&#8211;2021 Cisco System Inc.  All Rights Reserved.')
     exclude '**/BuildConfig.java'
     exclude '**/R.java'
     exclude '**/internal/**'

diff --git a/sdk/src/androidTest/java/com/ciscowebex/androidsdk/WebexTestRunner.java b/sdk/src/androidTest/java/com/ciscowebex/androidsdk/WebexTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/androidTest/java/com/ciscowebex/androidsdk/auth/JWTAuthenticatorTest.java b/sdk/src/androidTest/java/com/ciscowebex/androidsdk/auth/JWTAuthenticatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/AndroidManifest.xml b/sdk/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 
         package="com.ciscowebex.androidsdk">
     <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.INTERNET" />
         <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
         <uses-permission android:name="android.permission.CAMERA" />

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/CompletionHandler.java b/sdk/src/main/java/com/ciscowebex/androidsdk/CompletionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/Result.java b/sdk/src/main/java/com/ciscowebex/androidsdk/Result.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/Webex.java b/sdk/src/main/java/com/ciscowebex/androidsdk/Webex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/WebexError.java b/sdk/src/main/java/com/ciscowebex/androidsdk/WebexError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/WebexEvent.java b/sdk/src/main/java/com/ciscowebex/androidsdk/WebexEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
 package com.ciscowebex.androidsdk;
 
 import com.ciscowebex.androidsdk.internal.model.ActivityModel;
+import com.ciscowebex.androidsdk.internal.model.LocusModel;
+import com.ciscowebex.androidsdk.internal.model.LocusParticipantInfoModel;
 import com.ciscowebex.androidsdk.internal.model.PersonModel;
 import com.ciscowebex.androidsdk.utils.WebexId;
 
@@ -56,6 +58,13 @@ protected Base(ActivityModel activity) {
             }
         }
 
+        protected Base(LocusModel locus) {
+            LocusParticipantInfoModel participant = locus.getHost();
+            if (participant != null) {
+                _actorId = new WebexId(WebexId.Type.PEOPLE, WebexId.DEFAULT_CLUSTER, participant.getId()).getBase64Id();
+            }
+        }
+
         /**
          * @see WebexEvent
          */

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/Authenticator.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/Authenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/JWTAuthenticator.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/JWTAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/OAuthAuthenticator.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/OAuthAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/OAuthWebViewAuthenticator.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/OAuthWebViewAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/SSOAuthenticator.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/SSOAuthenticator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/internal/OAuthLauncher.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/internal/OAuthLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/auth/internal/TokenAuthenticator.java b/sdk/src/main/java/com/ciscowebex/androidsdk/auth/internal/TokenAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/sdk/src/main/java/com/ciscowebex/androidsdk/internal/AcquirePermissionActivity.java b/sdk/src/main/java/com/ciscowebex/androidsdk/internal/AcquirePermissionActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Cisco Systems Inc
+ * Copyright 2016-2021 Cisco Systems Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal