fix PR comment

project-chip · Mar 25, 2022 · 060fafc · 060fafc
1 parent 5f60bbf
commit 060fafc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/platform/android/AndroidChipPlatform-JNI.cpp b/src/platform/android/AndroidChipPlatform-JNI.cpp
@@ -266,6 +266,13 @@ JNI_METHOD(jboolean, updateCommissionableDataProviderData)
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CommissionableDataProviderMgrImpl().Update(env, spake2pVerifierBase64, Spake2pSaltBase64,
                                                                 spake2pIterationCount, setupPasscode, discriminator);
+
+
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Failed to update commissionable data provider data: %s", ErrorStr(err));
+        return false;
+    }
 
-    return err == CHIP_NO_ERROR;
+    return true;
 }
diff --git a/src/platform/android/CommissionableDataProviderImpl.cpp b/src/platform/android/CommissionableDataProviderImpl.cpp
@@ -155,32 +155,32 @@ CHIP_ERROR CommissionableDataProviderImpl::Update(JNIEnv * env, jstring spake2pV
     }
 
     // Set to global CommissionableDataProvider once success first time
-    if (!mIsInitialized)
+    if (!mFirstUpdated)
     {
         DeviceLayer::SetCommissionableDataProvider(this);
     }
-    mIsInitialized = true;
+    mFirstUpdated = true;
 
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR CommissionableDataProviderImpl::GetSetupDiscriminator(uint16_t & setupDiscriminator)
 {
-    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mFirstUpdated, CHIP_ERROR_INCORRECT_STATE);
     setupDiscriminator = mDiscriminator;
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR CommissionableDataProviderImpl::GetSpake2pIterationCount(uint32_t & iterationCount)
 {
-    VerifyOrReturnLogError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnLogError(mFirstUpdated, CHIP_ERROR_INCORRECT_STATE);
     iterationCount = mPaseIterationCount;
     return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR CommissionableDataProviderImpl::GetSpake2pSalt(chip::MutableByteSpan & saltBuf)
 {
-    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mFirstUpdated, CHIP_ERROR_INCORRECT_STATE);
 
     VerifyOrReturnError(saltBuf.size() >= kSpake2p_Max_PBKDF_Salt_Length, CHIP_ERROR_BUFFER_TOO_SMALL);
     memcpy(saltBuf.data(), mPaseSalt.data(), mPaseSalt.size());
@@ -191,7 +191,7 @@ CHIP_ERROR CommissionableDataProviderImpl::GetSpake2pSalt(chip::MutableByteSpan
 
 CHIP_ERROR CommissionableDataProviderImpl::GetSpake2pVerifier(chip::MutableByteSpan & verifierBuf, size_t & outVerifierLen)
 {
-    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mFirstUpdated, CHIP_ERROR_INCORRECT_STATE);
 
     // By now, serialized verifier from Init should be correct size
     VerifyOrReturnError(mSerializedPaseVerifier.size() == kSpake2p_VerifierSerialized_Length, CHIP_ERROR_INTERNAL);
@@ -206,7 +206,7 @@ CHIP_ERROR CommissionableDataProviderImpl::GetSpake2pVerifier(chip::MutableByteS
 
 CHIP_ERROR CommissionableDataProviderImpl::GetSetupPasscode(uint32_t & setupPasscode)
 {
-    VerifyOrReturnError(mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mFirstUpdated, CHIP_ERROR_INCORRECT_STATE);
 
     // Pretend not implemented if we don't have a passcode value externally set
     if (!mSetupPasscode.HasValue())

diff --git a/src/platform/android/CommissionableDataProviderImpl.h b/src/platform/android/CommissionableDataProviderImpl.h
@@ -49,7 +49,7 @@ class CommissionableDataProviderImpl : public chip::DeviceLayer::CommissionableD
 private:
     friend CommissionableDataProviderImpl & CommissionableDataProviderMgrImpl();
     static CommissionableDataProviderImpl sInstance;
-    bool mIsInitialized = false;
+    bool mFirstUpdated = false;
     std::vector<uint8_t> mSerializedPaseVerifier;
     std::vector<uint8_t> mPaseSalt;
     uint32_t mPaseIterationCount = 0;