From 2e4a97fde7dd8d880287105571811dd9f9c89953 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Thu, 6 Aug 2020 14:01:12 -0400 Subject: [PATCH] 4.0 prep: move IdentityTokens data to new AccountsSettings.json file --- FileLiberator/UNTESTED/DownloadBook.cs | 2 +- FileManager/UNTESTED/AudibleApiStorage.cs | 2 +- InternalUtilities/UNTESTED/AudibleApiActions.cs | 2 +- LibationLauncher/LibationLauncher.csproj | 2 +- LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FileLiberator/UNTESTED/DownloadBook.cs b/FileLiberator/UNTESTED/DownloadBook.cs index 63d77c4c..066c9a7f 100644 --- a/FileLiberator/UNTESTED/DownloadBook.cs +++ b/FileLiberator/UNTESTED/DownloadBook.cs @@ -41,7 +41,7 @@ namespace FileLiberator private async Task downloadBookAsync(LibraryBook libraryBook, string tempAaxFilename) { - var api = await AudibleApi.EzApiCreator.GetApiAsync(AudibleApiStorage.IdentityTokensFile, null, Configuration.Instance.LocaleCountryCode); + var api = await AudibleApi.EzApiCreator.GetApiAsync(AudibleApiStorage.AccountsSettingsFile, null, Configuration.Instance.LocaleCountryCode); var actualFilePath = await PerformDownloadAsync( tempAaxFilename, diff --git a/FileManager/UNTESTED/AudibleApiStorage.cs b/FileManager/UNTESTED/AudibleApiStorage.cs index 83859a44..868d47c3 100644 --- a/FileManager/UNTESTED/AudibleApiStorage.cs +++ b/FileManager/UNTESTED/AudibleApiStorage.cs @@ -5,6 +5,6 @@ namespace FileManager public static class AudibleApiStorage { // not customizable. don't move to config - public static string IdentityTokensFile => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json"); + public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json"); } } diff --git a/InternalUtilities/UNTESTED/AudibleApiActions.cs b/InternalUtilities/UNTESTED/AudibleApiActions.cs index 8601734d..b967ec46 100644 --- a/InternalUtilities/UNTESTED/AudibleApiActions.cs +++ b/InternalUtilities/UNTESTED/AudibleApiActions.cs @@ -28,7 +28,7 @@ namespace InternalUtilities private async Task> getItemsAsync(ILoginCallback callback) { - var api = await EzApiCreator.GetApiAsync(AudibleApiStorage.IdentityTokensFile, callback, Configuration.Instance.LocaleCountryCode); + var api = await EzApiCreator.GetApiAsync(AudibleApiStorage.AccountsSettingsFile, callback, Configuration.Instance.LocaleCountryCode); var items = await AudibleApiExtensions.GetAllLibraryItemsAsync(api); // remove episode parents diff --git a/LibationLauncher/LibationLauncher.csproj b/LibationLauncher/LibationLauncher.csproj index 98b6170a..6d6c73a5 100644 --- a/LibationLauncher/LibationLauncher.csproj +++ b/LibationLauncher/LibationLauncher.csproj @@ -13,7 +13,7 @@ win-x64 - 3.1.12.4 + 3.1.12.27 diff --git a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs b/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs index eab34583..52127d56 100644 --- a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs +++ b/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs @@ -91,7 +91,7 @@ namespace LibationWinForms.Dialogs // - clear/delete identity tokens file config.LocaleCountryCode = newLocale; config.DecryptKey = ""; - File.Delete(AudibleApiStorage.IdentityTokensFile); + File.Delete(AudibleApiStorage.AccountsSettingsFile); } config.DownloadsInProgressEnum = downloadsInProgressLibationFilesRb.Checked ? "LibationFiles" : "WinTemp";