fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/ed321983d236285205a93e2627269a99b4124e08/applications/asset_tracker_v2

Author: GitHub Actions

src/cloud/cloud_codec/nrf_cloud/nrf_cloud_codec.c

@@ -245,7 +245,13 @@ int cloud_codec_encode_neighbor_cells(struct cloud_codec_data *output,
 		return -ENODATA;
 	}
 
-	err = nrf_cloud_cell_pos_request_json_get(&info, false, &root_obj);
+	/* Set the request location flag when encoding the cellular position request.
+	 * In general, the application does not care about
+	 * getting the location back from cellular position requests. However, this is
+	 * needed to ensure that the cellular location of the application
+	 * is visualized in the nRF Cloud web UI.
+	 */
+	err = nrf_cloud_cell_pos_request_json_get(&info, true, &root_obj);
 	if (err) {
 		LOG_ERR("nrf_cloud_cell_pos_request_json_get, error: %d", err);
 		return -ENOMEM;

src/cloud/nrf_cloud_integration.c

@@ -14,6 +14,11 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #define REQUEST_DEVICE_STATE_STRING ""
 
+/* String used to filter out responses to
+ * cellular position requests (neighbor cell measurements).
+ */
+#define CELL_POS_FILTER_STRING "CELL_POS"
+
 static cloud_wrap_evt_handler_t wrapper_evt_handler;
 
 static void cloud_wrapper_notify_event(const struct cloud_wrap_event *evt)
@@ -61,10 +66,23 @@ static int send_service_info(void)
 	return 0;
 }
 
+/* Function used to filter out responses to cellular position requests. */
+static int cell_pos_response_filter(char *response, size_t len)
+{
+	ARG_UNUSED(len);
+
+	if (strstr(response, CELL_POS_FILTER_STRING) != NULL) {
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 static void nrf_cloud_event_handler(const struct nrf_cloud_evt *evt)
 {
 	struct cloud_wrap_event cloud_wrap_evt = { 0 };
 	bool notify = false;
+	int err;
 
 	switch (evt->type) {
 	case NRF_CLOUD_EVT_TRANSPORT_CONNECTING:
@@ -78,8 +96,7 @@ static void nrf_cloud_event_handler(const struct nrf_cloud_evt *evt)
 		cloud_wrap_evt.type = CLOUD_WRAP_EVT_CONNECTED;
 		notify = true;
 
-		int err = send_service_info();
-
+		err = send_service_info();
 		if (err) {
 			LOG_ERR("Failed to send nRF Cloud service information");
 			cloud_wrap_evt.type = CLOUD_WRAP_EVT_ERROR;
@@ -105,6 +122,17 @@ static void nrf_cloud_event_handler(const struct nrf_cloud_evt *evt)
 		break;
 	case NRF_CLOUD_EVT_RX_DATA:
 		LOG_DBG("NRF_CLOUD_EVT_RX_DATA");
+
+		/* Filter out responses to cellular position requests. The application does not care
+		 * about getting its location back after neighbor cell measurements have been
+		 * sent to cloud.
+		 */
+		err = cell_pos_response_filter((char *)evt->data.ptr, evt->data.len);
+		if (err) {
+			LOG_DBG("Cellular position response received, aborting");
+			return;
+		}
+
 		cloud_wrap_evt.type = CLOUD_WRAP_EVT_DATA_RECEIVED;
 		cloud_wrap_evt.data.buf = (char *)evt->data.ptr;
 		cloud_wrap_evt.data.len = evt->data.len;
@@ -113,6 +141,26 @@ static void nrf_cloud_event_handler(const struct nrf_cloud_evt *evt)
 	case NRF_CLOUD_EVT_USER_ASSOCIATION_REQUEST:
 		LOG_WRN("NRF_CLOUD_EVT_USER_ASSOCIATION_REQUEST");
 		LOG_WRN("Add the device to nRF Cloud and wait for it to reconnect");
+
+		/* It is expected that the application will disconnect and reconnect to nRF Cloud
+		 * several times during device association.
+		 */
+
+		/* Explicitly disconnect the nRF Cloud transport library to clear its
+		 * internal state. This is needed by the library to allow subsequent calls to
+		 * nrf_cloud_connect(), which is necessary to complete device association.
+		 */
+		err = nrf_cloud_disconnect();
+		if (err) {
+			LOG_ERR("nrf_cloud_disconnect failed, error: %d", err);
+
+			/* If disconnection from nRF Cloud fails, the cloud module is notified with
+			 * an error. The application is expected to perform a reboot in order
+			 * to reconnect to nRF Cloud and complete device association.
+			 */
+			cloud_wrap_evt.type = CLOUD_WRAP_EVT_ERROR;
+			notify = true;
+		}
 		break;
 	case NRF_CLOUD_EVT_USER_ASSOCIATED:
 		LOG_DBG("NRF_CLOUD_EVT_USER_ASSOCIATED");