Pierred/rel5 (#26)

* Release 1.1.0.
Sync matterhorn with Matter SDK at commit d47c8f7a3ac84f2cc04e5411f064baeb9fe8c93f.
REL5 for EAP partners.

* Release 1.1.0.
Sync matterhorn with Matter SDK at commit d47c8f7a3ac84f2cc04e5411f064baeb9fe8c93f.
REL5 for EAP partners.

* Release 1.1.0.
Sync matterhorn with Matter SDK at commit d47c8f7a3ac84f2cc04e5411f064baeb9fe8c93f.
REL5 for EAP partners.
Fix issue #24.

app/build.gradle

@@ -17,8 +17,7 @@ android {
         minSdk 27
         targetSdk 31
         versionCode 10
-        versionName "1.0.3"
-
+        versionName "1.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/java/com/google/homesampleapp/chip/BaseCompletionListener.kt

@@ -59,4 +59,12 @@ abstract class BaseCompletionListener : ChipDeviceController.CompletionListener
   override fun onOpCSRGenerationComplete(csr: ByteArray) {
     Timber.d("onOpCSRGenerationComplete(): csr [${csr}]")
   }
+
+  override fun onReadCommissioningInfo(vendorId: Int, productId: Int, wifiEndpointId: Int, threadEndpointId: Int) {
+    Timber.d("onReadCommissioningInfo: vendorId [${vendorId}]  productId [${productId}]  wifiEndpointId [${wifiEndpointId}] threadEndpointId [${threadEndpointId}]")
+  }
+
+  override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Int) {
+    Timber.d("onCommissioningStatusUpdate nodeId [${nodeId}]  stage [${stage}]  errorCode [${errorCode}]")
+  }
 }

app/src/main/java/com/google/homesampleapp/chip/ChipClient.kt

@@ -18,16 +18,19 @@ package com.google.homesampleapp.chip
 
 import android.content.Context
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.ControllerParams
 import chip.devicecontroller.GetConnectedDeviceCallbackJni.GetConnectedDeviceCallback
 import chip.devicecontroller.NetworkCredentials
 import chip.devicecontroller.PaseVerifierParams
 import chip.platform.AndroidBleManager
 import chip.platform.AndroidChipPlatform
-import chip.platform.ChipMdnsCallbackImpl
-import chip.platform.DiagnosticDataProviderImpl
-import chip.platform.NsdManagerServiceResolver
 import chip.platform.PreferencesConfigurationManager
 import chip.platform.PreferencesKeyValueStoreManager
+import chip.platform.NsdManagerServiceResolver
+import chip.platform.NsdManagerServiceBrowser
+import chip.platform.ChipMdnsCallbackImpl
+import chip.platform.DiagnosticDataProviderImpl
+
 import com.google.homesampleapp.stripLinkLocalInIpAddress
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
@@ -41,6 +44,9 @@ import timber.log.Timber
 @Singleton
 class ChipClient @Inject constructor(@ApplicationContext context: Context) {
 
+  /* 0xFFF4 is a test vendor ID, replace with your assigned company ID */
+  private val VENDOR_ID = 0xFFF4
+
   // Lazily instantiate [ChipDeviceController] and hold a reference to it.
   private val chipDeviceController: ChipDeviceController by lazy {
     ChipDeviceController.loadJni()
@@ -49,9 +55,11 @@ class ChipClient @Inject constructor(@ApplicationContext context: Context) {
         PreferencesKeyValueStoreManager(context),
         PreferencesConfigurationManager(context),
         NsdManagerServiceResolver(context),
+        NsdManagerServiceBrowser(context),
         ChipMdnsCallbackImpl(),
-        DiagnosticDataProviderImpl(context))
-    ChipDeviceController()
+        DiagnosticDataProviderImpl(context)
+    )
+    ChipDeviceController(ControllerParams.newBuilder().setUdpListenPort(0).setControllerVendorId(VENDOR_ID).build())
   }
 
   /**
@@ -110,6 +118,16 @@ class ChipClient @Inject constructor(@ApplicationContext context: Context) {
               super.onError(error)
               continuation.resumeWithException(error)
             }
+
+            override fun onReadCommissioningInfo(vendorId: Int, productId: Int, wifiEndpointId: Int, threadEndpointId: Int) {
+              super.onReadCommissioningInfo(vendorId, productId, wifiEndpointId, threadEndpointId)
+              continuation.resume(Unit)
+            }
+
+            override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Int) {
+              super.onCommissioningStatusUpdate(nodeId, stage, errorCode)
+              continuation.resume(Unit)
+            }
           })
 
       // Temporary workaround to remove interface indexes from ipAddress

build.gradle

@@ -7,7 +7,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.38.1"
         classpath 'com.google.protobuf:protobuf-java:3.4.0'
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.41'
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2")