@@ -233,7 +233,7 @@ private async Task<bool> SetAdbPathIfValid(string adbExecutablePath)
233
233
}
234
234
235
235
/// <returns>The device ID of one of the Quest devices connected, or a non-quest device if no quest is present.</returns>
236
- private async Task < string > GetDeviceIdToUse ( )
236
+ private async Task < ( string id , string model ) > GetDeviceToUse ( )
237
237
{
238
238
var devices = await ListDevicesInternal ( ) ;
239
239
@@ -243,18 +243,16 @@ private async Task<string> GetDeviceIdToUse()
243
243
244
244
if ( questDevices . Any ( ) )
245
245
{
246
- Log . Debug ( "Using quest device" ) ;
247
246
if ( questDevices . Count > 1 )
248
247
{
249
248
Log . Warning ( "Multiple quest devices connected - using the first device" ) ;
250
249
}
251
250
252
- return questDevices . First ( ) . id ;
251
+ return questDevices . First ( ) ;
253
252
}
254
253
else
255
254
{
256
- Log . Debug ( "Using non-quest device" ) ;
257
- return devices . First ( ) . id ;
255
+ return devices . First ( ) ;
258
256
}
259
257
260
258
}
@@ -359,9 +357,10 @@ public async Task<ProcessOutput> RunCommand(string command, params int[] allowed
359
357
else if ( allOutput . Contains ( "multiple devices" ) || output . ErrorOutput . Contains ( "more than one device/emulator" ) )
360
358
{
361
359
Log . Information ( "Multiple devices detected, choosing the Quest device if present" ) ;
362
- _chosenDeviceId = await GetDeviceIdToUse ( ) ;
360
+ var device = await GetDeviceToUse ( ) ;
361
+ _chosenDeviceId = device . id ;
363
362
364
- Log . Information ( "Using {DeviceId}" , _chosenDeviceId ) ;
363
+ Log . Information ( "Using id: {DeviceId} model: {Model} " , device . id , device . model ) ;
365
364
}
366
365
else if ( allOutput . Contains ( "unauthorized" ) )
367
366
{
0 commit comments