CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Make sure we reset old OneDrive config

Browse source
This commit is contained in:
SupSuper 2018-04-13 16:10:58 +01:00
parent 0e632acdff
commit 5f77d55523
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShareX.UploadersLib/FileUploaders/OneDrive.cs
View file

@ -43,14 +43,14 @@ public class OneDriveFileUploaderService : FileUploaderService
public override bool CheckConfig(UploadersConfig config)
{
return OAuth2Info.CheckOAuth(config.OneDriveOAuth2Info);
return OAuth2Info.CheckOAuth(config.OneDriveV2OAuth2Info);
}
public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo)
{
return new OneDrive(config.OneDriveOAuth2Info)
return new OneDrive(config.OneDriveV2OAuth2Info)
{
FolderID = config.OneDriveSelectedFolder.id,
FolderID = config.OneDriveV2SelectedFolder.id,
AutoCreateShareableLink = config.OneDriveAutoCreateShareableLink
};
}

8
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -395,7 +395,7 @@ public void LoadSettings()
tvOneDrive.Nodes.Clear();
OneDriveAddFolder(OneDrive.RootFolder, null);
if (OAuth2Info.CheckOAuth(Config.OneDriveOAuth2Info))
if (OAuth2Info.CheckOAuth(Config.OneDriveV2OAuth2Info))
{
oAuth2OneDrive.Status = OAuthLoginStatus.LoginSuccessful;
@ -403,7 +403,7 @@ public void LoadSettings()
}
cbOneDriveCreateShareableLink.Checked = Config.OneDriveAutoCreateShareableLink;
lblOneDriveFolderID.Text = Resources.UploadersConfigForm_LoadSettings_Selected_folder_ + " " + Config.OneDriveSelectedFolder.name;
lblOneDriveFolderID.Text = Resources.UploadersConfigForm_LoadSettings_Selected_folder_ + " " + Config.OneDriveV2SelectedFolder.name;
tvOneDrive.CollapseAll();
#endregion OneDrive
@ -1750,7 +1750,7 @@ private void oAuth2OneDrive_RefreshButtonClicked()
private void oAuth2OneDrive_ClearButtonClicked()
{
Config.OneDriveOAuth2Info = null;
Config.OneDriveV2OAuth2Info = null;
}
private void cbOneDriveCreateShareableLink_CheckedChanged(object sender, EventArgs e)
@ -1764,7 +1764,7 @@ private void tvOneDrive_AfterSelect(object sender, TreeViewEventArgs e)
if (file != null)
{
lblOneDriveFolderID.Text = Resources.UploadersConfigForm_LoadSettings_Selected_folder_ + " " + file.name;
Config.OneDriveSelectedFolder = file;
Config.OneDriveV2SelectedFolder = file;
}
}

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

@ -715,7 +715,7 @@ public void OneDriveAuthOpen()
if (!string.IsNullOrEmpty(url))
{
Config.OneDriveOAuth2Info = oauth;
Config.OneDriveV2OAuth2Info = oauth;
URLHelpers.OpenURL(url);
DebugHelper.WriteLine("OneDriveAuthOpen - Authorization URL is opened: " + url);
}
@ -734,9 +734,9 @@ public void OneDriveAuthComplete(string code)
{
try
{
if (!string.IsNullOrEmpty(code) && Config.OneDriveOAuth2Info != null)
if (!string.IsNullOrEmpty(code) && Config.OneDriveV2OAuth2Info != null)
{
bool result = new OneDrive(Config.OneDriveOAuth2Info).GetAccessToken(code);
bool result = new OneDrive(Config.OneDriveV2OAuth2Info).GetAccessToken(code);
if (result)
{
@ -763,9 +763,9 @@ public void OneDriveAuthRefresh()
{
try
{
if (OAuth2Info.CheckOAuth(Config.OneDriveOAuth2Info))
if (OAuth2Info.CheckOAuth(Config.OneDriveV2OAuth2Info))
{
bool result = new OneDrive(Config.OneDriveOAuth2Info).RefreshAccessToken();
bool result = new OneDrive(Config.OneDriveV2OAuth2Info).RefreshAccessToken();
if (result)
{
@ -790,7 +790,7 @@ public void OneDriveAuthRefresh()
public void OneDriveListFolders(OneDriveFileInfo fileEntry, TreeNode tnParent)
{
Application.DoEvents();
OneDrive oneDrive = new OneDrive(Config.OneDriveOAuth2Info);
OneDrive oneDrive = new OneDrive(Config.OneDriveV2OAuth2Info);
OneDrivePathInfo oneDrivePathInfo = oneDrive.GetPathInfo(fileEntry.id);
tnParent.Nodes.Clear();
foreach (OneDriveFileInfo folder in oneDrivePathInfo.value)

4
ShareX.UploadersLib/UploadersConfig.cs
View file

@ -179,8 +179,8 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
#region OneDrive
public OAuth2Info OneDriveOAuth2Info = null;
public OneDriveFileInfo OneDriveSelectedFolder = OneDrive.RootFolder;
public OAuth2Info OneDriveV2OAuth2Info = null;
public OneDriveFileInfo OneDriveV2SelectedFolder = OneDrive.RootFolder;
public bool OneDriveAutoCreateShareableLink = true;
#endregion OneDrive