CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 14:11:38 +12:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5006 from BallisticLingonberries/fix-pushbullet

Browse source 
Fix storing invalid/deleted pushbullet devices
This commit is contained in:
Jaex 2020-08-31 07:55:45 +03:00 committed by GitHub
parent 4ac8829950 12a4873b9f
commit 2e35136f53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.UploadersLib/FileUploaders/Pushbullet.cs
View file

@ -181,7 +181,7 @@ public List<PushbulletDevice> GetDeviceList()
PushbulletResponseDevices devicesResponse = JsonConvert.DeserializeObject<PushbulletResponseDevices>(response);
if (devicesResponse != null && devicesResponse.devices != null)
return devicesResponse.devices.Select(x => new PushbulletDevice { Key = x.iden, Name = x.nickname }).ToList();
return devicesResponse.devices.Where(x => !String.IsNullOrEmpty(x.nickname)).Select(x1 => new PushbulletDevice { Key = x1.iden, Name = x1.nickname }).ToList();
return new List<PushbulletDevice>();
}

3
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -799,7 +799,8 @@ public void PushbulletGetDevices()
Config.PushbulletSettings.DeviceList.ForEach(pbDevice =>
{
cboPushbulletDevices.Items.Add(pbDevice.Name ?? Resources.UploadersConfigForm_LoadSettings_Invalid_device_name);
if (!String.IsNullOrEmpty(pbDevice.Name))
cboPushbulletDevices.Items.Add(pbDevice.Name);
});
cboPushbulletDevices.SelectedIndex = 0;