Skip to content

Commit 4a25d71

Browse files
robszewczykhuangxuyong
authored andcommitted
Fix a a few gaps in jumping between Java and C++ for Messages cluster (project-chip#32295)
Fix dangling problems arising from uint16 seconds for duration to uint64_t milliseconds
1 parent b932800 commit 4a25d71

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

examples/tv-app/android/java/MessagesManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void MessagesManager::InitializeWithObjects(jobject managerObject)
7474
}
7575

7676
mPresentMessagesMethod =
77-
env->GetMethodID(managerClass, "presentMessages", "(Ljava/lang/String;IIJILjava/lang/String;Ljava/util/HashMap;)Z");
77+
env->GetMethodID(managerClass, "presentMessages", "(Ljava/lang/String;IIJJLjava/lang/String;Ljava/util/HashMap;)Z");
7878
if (mPresentMessagesMethod == nullptr)
7979
{
8080
ChipLogError(Zcl, "Failed to access MessagesManager 'presentMessages' method");
@@ -182,7 +182,7 @@ CHIP_ERROR MessagesManager::HandleGetMessages(AttributeValueEncoder & aEncoder)
182182
message.startTime = DataModel::Nullable<uint32_t>(static_cast<uint32_t>(jstartTime));
183183
}
184184

185-
jfieldID durationField = env->GetFieldID(messageClass, "duration", "I");
185+
jfieldID durationField = env->GetFieldID(messageClass, "duration", "J");
186186
jlong jduration = env->GetLongField(messageObject, durationField);
187187
if (jduration >= 0)
188188
{

examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MessagesManagerStub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public MessagesManagerStub(int endpoint) {
3636
responseOptions.put(new Long(1), "Yes");
3737
responseOptions.put(new Long(2), "No");
3838
presentMessages(
39-
"31323334353637383930313233343536", 1, 1, 30, 60, "TestMessage", responseOptions);
39+
"31323334353637383930313233343536", 1, 1, 30, 60000, "TestMessage", responseOptions);
4040
Log.d(TAG, "MessagesManagerStub: added dummy message");
4141
}
4242

0 commit comments

Comments
 (0)