Merge pull request #267603 from roadieroundup/main

changes in voice calling quick starts for android and windows.

Author: Stacyrch140

articles/communication-services/quickstarts/voice-video-calling/includes/get-started/get-started-android.md

@@ -36,7 +36,7 @@ From Android Studio, select Start a new Android Studio project.
 
 :::image type="content" source="../../media/android/studio-new-project.png" alt-text="Screenshot showing the 'Start a new Android Studio Project' button selected in Android Studio.":::
 
-Select "Empty Activity" project template under "Phone and Tablet".
+Select "Empty Views Activity" project template under "Phone and Tablet".
 
 :::image type="content" source="../../media/android/studio-blank-activity.png" alt-text="Screenshot showing the 'Empty Activity' option selected in the Project Template Screen.":::
 
@@ -48,23 +48,21 @@ Select Minimum SDK of "API 26: Android 8.0 (Oreo)" or greater.
 ### Install the package
 
 <!-- TODO: update with instructions on how to download, install and add package to project -->
-Locate your project level build.gradle and make sure to add `mavenCentral()` to the list of repositories under `buildscript` and `allprojects`
+Locate your project `settings.gradle.kts` and make sure to see `mavenCentral()` at the list of repositories under `pluginManagement` and `dependencyResolutionManagement`
 ```groovy
-buildscript {
+pluginManagement {
     repositories {
     ...
         mavenCentral()
     ...
     }
 }
-```
 
-```groovy
-allprojects {
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
     ...
         mavenCentral()
-    ...
     }
 }
 ```
@@ -73,9 +71,7 @@ Then, in your module level build.gradle add the following lines to the dependenc
 ```groovy
 android {
     ...
-    packagingOptions {
-        pickFirst  'META-INF/*'
-    }
+    
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -84,7 +80,7 @@ android {
 
 dependencies {
     ...
-    implementation 'com.azure.android:azure-communication-calling:1.0.0-beta.8'
+    implementation ("com.azure.android:azure-communication-calling:2.6.0")
     ...
 }
 ```
@@ -160,6 +156,7 @@ Two inputs are needed: a text input for the callee ID, and a button for placing
         android:ems="10"
         android:hint="Callee Id"
         android:inputType="textPersonName"
+        android:minHeight="48dp"
         app:layout_constraintBottom_toTopOf="@+id/call_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -195,6 +192,7 @@ import com.azure.android.communication.calling.StartCallOptions;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -248,13 +246,16 @@ For Android 6.0 and higher (API level 23) and `targetSdkVersion` 23 or higher, p
  * Request each required permission if the app doesn't already have it.
  */
 private void getAllPermissions() {
-    String[] requiredPermissions = new String[]{Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE};
+    String[] requiredPermissions = new String[]{android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAMERA, android.Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_PHONE_STATE};
+
     ArrayList<String> permissionsToAskFor = new ArrayList<>();
+
     for (String permission : requiredPermissions) {
         if (ActivityCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) {
             permissionsToAskFor.add(permission);
         }
     }
+
     if (!permissionsToAskFor.isEmpty()) {
         ActivityCompat.requestPermissions(this, permissionsToAskFor.toArray(new String[0]), 1);
     }
@@ -290,8 +291,8 @@ private void createAgent() {
     String userToken = "<User_Access_Token>";
 
     try {
-        CommunicationTokenCredential credential = new CommunicationTokenCredential(userToken);
-        callAgent = new CallClient().createCallAgent(getApplicationContext(), credential).get();
+            CommunicationTokenCredential credential = new CommunicationTokenCredential(userToken);
+            callAgent = new CallClient().createCallAgent(getApplicationContext(), credential).get();
     } catch (Exception ex) {
         Toast.makeText(getApplicationContext(), "Failed to create call agent.", Toast.LENGTH_SHORT).show();
     }
@@ -309,14 +310,15 @@ Placing the call can be done via the call agent, and just requires providing a l
  */
 private void startCall() {
     EditText calleeIdView = findViewById(R.id.callee_id);
-    String calleeId = calleeIdView.getText().toString();
 
+    String calleeId = calleeIdView.getText().toString();
+
     StartCallOptions options = new StartCallOptions();
 
     callAgent.startCall(
-        getApplicationContext(),
-        new CommunicationUserIdentifier[] {new CommunicationUserIdentifier(calleeId)},
-        options);
+            getApplicationContext(),
+            Arrays.asList(new CommunicationUserIdentifier[]{new CommunicationUserIdentifier(calleeId)}),
+            options);
 }
 ```
 

articles/communication-services/quickstarts/voice-video-calling/includes/get-started/get-started-windows.md

@@ -38,7 +38,7 @@ In Visual Studio, create a new project with the **Blank App (Universal Windows)*
 
 #### Install the package
 
-Right select your project and go to `Manage Nuget Packages` to install `Azure.Communication.Calling.WindowsClient` [1.2.0-beta.1](https://www.nuget.org/packages/Azure.Communication.Calling.WindowsClient/1.2.0-beta.1) or superior. Make sure Include Preleased is checked.
+Right select your project and go to `Manage Nuget Packages` to install `Azure.Communication.Calling.WindowsClient` [1.4.0](https://www.nuget.org/packages/Azure.Communication.Calling.WindowsClient/1.4.0) or superior. Make sure `Include Prerelease` is checked if you want to see the versions for public preview.
 
 #### Request access
 
@@ -64,6 +64,9 @@ Open the `MainPage.xaml` of your project and add the `Grid` node to your `Page`:
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Width="800" Height="600">
 
+        <!-- Don't forget to replace ‘CallingQuickstart’ with your project’s name -->
+
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="16*"/>
@@ -132,7 +135,6 @@ namespace CallingQuickstart
         private CommunicationCall call;
 
         private LocalOutgoingAudioStream micStream;
-        private LocalOutgoingVideoStream cameraStream;
 
         #region Page initialization
         public MainPage()
@@ -143,6 +145,8 @@ namespace CallingQuickstart
 
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
+            await InitCallAgentAndDeviceManagerAsync();
+
             base.OnNavigatedTo(e);
         }
         #endregion
@@ -175,6 +179,21 @@ namespace CallingQuickstart
             // Handle connected and disconnected state change of a call
         }
         #endregion
+
+        #region Helper methods
+
+        private async Task InitCallAgentAndDeviceManagerAsync()
+        {
+            //Initialize the call agent and search for devices
+        }
+
+
+        private async Task<CommunicationCall> StartCallAsync(string acsCallee)
+        {
+            // Start a call to an Azure Communication Services user using the CallAgent and the callee id
+        }
+
+        #endregion
     }
 }
 ```
@@ -204,16 +223,21 @@ Add `InitCallAgentAndDeviceManagerAsync` function, which bootstraps the SDK. Thi
         {
             this.callClient = new CallClient(new CallClientOptions() {
                 Diagnostics = new CallDiagnosticsOptions() { 
+                    
+                    // make sure to put your project AppName
                     AppName = "CallingQuickstart",
+
                     AppVersion="1.0",
+
                     Tags = new[] { "Calling", "ACS", "Windows" }
                     }
+
                 });
 
-            // Set up local video stream using the first camera enumerated
+            // Set up local audio stream using the first mic enumerated
             var deviceManager = await this.callClient.GetDeviceManagerAsync();
-            var camera = deviceManager?.Cameras?.FirstOrDefault();
             var mic = deviceManager?.Microphones?.FirstOrDefault();
+
             micStream = new LocalOutgoingAudioStream();
 
             var tokenCredential = new CallTokenCredential(authToken, callTokenRefreshOptions);
@@ -224,6 +248,7 @@ Add `InitCallAgentAndDeviceManagerAsync` function, which bootstraps the SDK. Thi
             };
 
             this.callAgent = await this.callClient.CreateCallAgentAsync(tokenCredential, callAgentOptions);
+
             this.callAgent.IncomingCallReceived += OnIncomingCallAsync;
         }
 ```
@@ -233,7 +258,7 @@ Add `InitCallAgentAndDeviceManagerAsync` function, which bootstraps the SDK. Thi
 Once a `StartCallOptions` object is obtained, `CallAgent` can be used to initiate the Azure Communication Services call:
 
 ```C#
-        private async Task<CommunicationCall> StartAcsCallAsync(string acsCallee)
+        private async Task<CommunicationCall> StartCallAsync(string acsCallee)
         {
             var options = new StartCallOptions();
             var call = await this.callAgent.StartCallAsync( new [] { new UserCallIdentifier(acsCallee) }, options);
@@ -268,6 +293,7 @@ Mute the outgoing audio when the `Mute` button is clicked. Add the implementatio
             if (muteCheckbox != null)
             {
                 var call = this.callAgent?.Calls?.FirstOrDefault();
+
                 if (call != null)
                 {
                     if ((bool)muteCheckbox.IsChecked)
@@ -343,9 +369,33 @@ Application has an opportunity to configure how the incoming call should be acce
         }
 ```
 
+### Make call button work
+
+Once the `Callee ID` isn't null or empty, you can start a call.
+
+The call state must be changed using the `OnStateChangedAsync` action.
+
+```C#
+
+    private async void CallButton_Click(object sender, RoutedEventArgs e)
+    {
+        var callString = CalleeTextBox.Text.Trim();
+
+        if (!string.IsNullOrEmpty(callString))
+        {
+            call = await StartCallAsync(callString);
+
+            call.StateChanged += OnStateChangedAsync;
+        }
+    
+        
+    }
+
+```
+
 ### Run the code
 
-You can build and run the code on Visual Studio. For solution platforms, we support `ARM64`, `x64` and `x86`. 
+You can build and run the code on Visual Studio. For solution platforms, we support `ARM64`, `x64`, and `x86`. 
 
 You can make an outbound call by providing a user ID in the text field and clicking the `Start Call/Join` button. Calling `8:echo123` connects you with an echo bot, this feature is great for getting started and verifying your audio devices are working.
 
@@ -572,7 +622,7 @@ Add the implementation to the `CallButton_Click` to start various kinds of calls
         {
             var callString = CalleeTextBox.Text.Trim();
 
-            call = await StartAcsCallAsync(callString);
+            call = await StartCallAsync(callString);
             if (call != null)
             {
                 call.StateChanged += OnStateChangedAsync;
@@ -657,7 +707,7 @@ In the meeting join scenario, `JoinCallOptions` is made available to customize t
 Once a `StartCallOptions` object is obtained, `CallAgent` can be used to initiate the Azure Communication Services call:
 
 ```C#
-        private async Task<CommunicationCall> StartAcsCallAsync(string acsCallee)
+        private async Task<CommunicationCall> StartCallAsync(string acsCallee)
         {
             var options = new StartCallOptions();
             var call = await this.callAgent.StartCallAsync( new [] { new UserCallIdentifier(acsCallee) }, options);