Destroy receiver when launching in case that BT is not connected 91/245491/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Sat, 10 Oct 2020 04:00:45 +0000 (13:00 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Sat, 10 Oct 2020 04:03:07 +0000 (13:03 +0900)
Change-Id: I5413d0a17683d7b189b331d0a65c269e87366515
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
receiver/src/ft.cpp

index f797447..4467722 100644 (file)
@@ -655,7 +655,9 @@ static void _on_connection_terminated(sap_peer_agent_h peer_agent,
         break;
     }
 
-    sap_socket_destroy(priv->socket);
+    if (priv->socket)
+        sap_socket_destroy(priv->socket);
+
     priv->socket = NULL;
 
     set_sync_progressing(FALSE);
@@ -1222,6 +1224,7 @@ static void _on_device_status_changed(sap_device_status_e status,
                                       sap_transport_type_e transport_type,
                                       void *user_data)
 {
+    bool unknown_transport_type = false;
     STLOGD("%s, status :%d", __func__, status);
 
     switch (transport_type) {
@@ -1242,12 +1245,13 @@ static void _on_device_status_changed(sap_device_status_e status,
             break;
         default:
             STLOGE("unknown transport_type (%d)", transport_type);
+            unknown_transport_type = true;
             break;
     }
 
     switch (status) {
         case SAP_DEVICE_STATUS_DETACHED:
-            STLOGD("device is not connected.");
+            STLOGD("device is detached.");
             send_message("sync_stop_result", "cancel");
             break;
         case SAP_DEVICE_STATUS_ATTACHED:
@@ -1258,6 +1262,9 @@ static void _on_device_status_changed(sap_device_status_e status,
             STLOGE("unknown status (%d)", status);
             break;
     }
+
+    if (unknown_transport_type && status == SAP_DEVICE_STATUS_DETACHED)
+        sticker_service_quit();
 }
 
 gboolean agent_initialize()