modules: main: Fix reporting buffer mode handling

Report the current mode of operation if not recevied from the cloud.

Signed-off-by: Simen S. Røstad <[email protected]>

Author: simensrostad

app/src/main.c

@@ -832,7 +832,8 @@ static void command_execute(uint32_t command_type)
 }
 
 static void handle_cloud_shadow_response(struct main_state *state_object,
-					 const struct cloud_msg *msg)
+					 const struct cloud_msg *msg,
+					 bool in_buffer_mode)
 {
 	int err;
 	struct config_params config = { 0 };
@@ -861,6 +862,15 @@ static void handle_cloud_shadow_response(struct main_state *state_object,
 	config.sample_interval = state_object->sample_interval_sec;
 	config.update_interval = state_object->update_interval_sec;
 
+	/* Set buffer_mode based on what was applied or current state.
+	 * If the cloud sent a mode change request (buffer_mode_valid is true), report that.
+	 * Otherwise, report the current operating mode passed in by the caller.
+	 */
+	if (!config.buffer_mode_valid) {
+		config.buffer_mode = in_buffer_mode;
+		config.buffer_mode_valid = true;
+	}
+
 	/* Only process commands from delta responses, not from desired responses.
 	 * Delta responses contain only new commands that haven't been executed yet.
 	 * While desired responses may contain old commands that have already been executed.
@@ -1044,7 +1054,7 @@ static enum smf_state_result buffer_connected_run(void *o)
 		case CLOUD_SHADOW_RESPONSE_DESIRED:
 			__fallthrough;
 		case CLOUD_SHADOW_RESPONSE_DELTA:
-			handle_cloud_shadow_response(state_object, msg);
+			handle_cloud_shadow_response(state_object, msg, true);
 
 			break;
 		case CLOUD_SHADOW_RESPONSE_EMPTY_DESIRED:
@@ -1451,7 +1461,7 @@ static enum smf_state_result passthrough_connected_run(void *o)
 		case CLOUD_SHADOW_RESPONSE_DESIRED:
 			__fallthrough;
 		case CLOUD_SHADOW_RESPONSE_DELTA:
-			handle_cloud_shadow_response(state_object, msg);
+			handle_cloud_shadow_response(state_object, msg, false);
 
 			return SMF_EVENT_HANDLED;
 		case CLOUD_SHADOW_RESPONSE_EMPTY_DESIRED: