Fast Initiation Advertisement invocation and compilation errors fixes.

a_wasdk_app/DevicesPage.xaml.cpp

@@ -223,8 +223,9 @@ namespace winrt::a_wasdk_app::implementation
         auto work = []() {
             g_nearby = new NearbyShareAPI();
             g_nearby->InitializeNearby();
+            g_nearby->StartFastInitiationAdvertising();
             g_nearby->StartScanning2(PhoneDeviceAdded);
-
+            
             while (true) {
                 Sleep(100);
             }

a_win32_dll/fast_init.cpp

@@ -209,7 +209,7 @@ namespace device {
 
     bool BluetoothAdvertisementWinrt::Initialize(
         std::unique_ptr<BluetoothAdvertisement::Data> advertisement_data) {
-        if (advertisement_data->service_uuids()) {
+        /*if (advertisement_data->service_uuids()) {
             BLUETOOTH_LOG(ERROR)
                 << "Windows does not support advertising Service UUIDs.";
             return false;
@@ -225,7 +225,7 @@ namespace device {
             BLUETOOTH_LOG(ERROR)
                 << "Windows does not support advertising Service Data.";
             return false;
-        }
+        }*/
 
         auto manufacturer_data = advertisement_data->manufacturer_data();
         if (!manufacturer_data) {
@@ -251,7 +251,7 @@ namespace device {
             return false;
         }
 
-        for (const auto& pair : *manufacturer_data) {
+       for (const auto& pair : *manufacturer_data) {
             uint16_t manufacturer = pair.first;
             const std::vector<uint8_t>& data = pair.second;
 
@@ -442,6 +442,12 @@ namespace device {
             adapter_->Initialize([this]() {
                 AdapterInitialized();
                 });
+
+            BluetoothAdapter* adapter =
+                std::move(adapter_);
+            std::vector<AdapterCallback> callbacks = std::move(adapter_callbacks_);
+            for (auto& callback : callbacks)
+                std::move(callback)(adapter);
             return;
         }
 

a_win32_dll/fast_initiation_advertiser.cc

@@ -64,10 +64,10 @@ void FastInitiationAdvertiser::StartAdvertising(
     FastInitType type,
     OnceClosure callback,
     OnceClosure error_callback) {
-    if (!(adapter_->IsPresent() && adapter_->IsPowered()))
+    /*if (!(adapter_->IsPresent() && adapter_->IsPowered()))
     {
         return;
-    }
+    }*/
     //DCHECK(!advertisement_);
     RegisterAdvertisement(type, std::move(callback), std::move(error_callback));
 }
@@ -100,6 +100,21 @@ void FastInitiationAdvertiser::RegisterAdvertisement(
         kFastInitiationServiceUuid, payload));
     advertisement_data->set_service_data(std::move(service_data));
 
+    // Construct Manufacturer data
+    device::BluetoothAdvertisement::ManufacturerData manufacturer_data;
+    uint16_t manufacturerId = 0x0006; // Placeholder value for manufacturer ID
+
+    auto payload1 = std::vector<uint8_t>(std::begin(kFastInitiationServiceId),
+        std::end(kFastInitiationServiceId));
+    payload1.insert(std::end(payload1), std::begin(kFastInitiationModelId), std::end(kFastInitiationModelId));
+    auto metadata1 = GenerateFastInitV1Metadata(type);
+    payload1.insert(std::end(payload1), std::begin(metadata1), std::end(metadata1));
+
+    manufacturer_data.insert(std::pair<uint16_t, std::vector<uint8_t>>(
+        manufacturerId, payload1));
+
+    advertisement_data->set_manufacturer_data(manufacturer_data);
+
     adapter_->RegisterAdvertisement(
         std::move(advertisement_data),
         [this, callback](device::BluetoothAdvertisement* advertisement) {

a_win32_dll/nearby_sharing_service_impl.cc

@@ -170,22 +170,22 @@ void NearbySharingServiceImpl::GetBluetoothAdapter()
         OnGetBluetoothAdapter(adapter);
         });
 
-    base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+    /*base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
         FROM_HERE,
         base::BindOnce(
             &device::BluetoothAdapterFactory::GetAdapter,
             base::Unretained(adapter_factory),
             base::BindOnce(&NearbySharingServiceImpl::OnGetBluetoothAdapter,
-                weak_ptr_factory_.GetWeakPtr())));
+                weak_ptr_factory_.GetWeakPtr())));*/
 }
 
 void NearbySharingServiceImpl::OnGetBluetoothAdapter(
     device::BluetoothAdapter* adapter)
 {
     bluetooth_adapter_ = nullptr;
     bluetooth_adapter_ = std::unique_ptr<device::BluetoothAdapter>(adapter);
-    bluetooth_adapter_->AddObserver(this);
-    fast_initiation_scanning_metrics_->SetBluetoothAdapter(adapter);
+    //bluetooth_adapter_->AddObserver(this);
+    //fast_initiation_scanning_metrics_->SetBluetoothAdapter(adapter);
 
     // TODO(crbug/1147652): The call to update the advertising interval is
     // removed to prevent a Bluez crash. We need to either reduce the global

a_win32_dll/nearby_sharing_service_impl.h

@@ -244,6 +244,8 @@ class NearbySharingServiceImpl
 
   void GetBluetoothAdapter();
 
+  void OnGetBluetoothAdapter(device::BluetoothAdapter* adapter);
+
 
   NearbySharingDecoder* const decoder_;