From e0406378cb88f86eb0325719097b8a81283e03cc Mon Sep 17 00:00:00 2001
From: Robert McRackan <rmcracka@itron.com>
Date: Thu, 13 Aug 2020 14:37:16 -0400
Subject: [PATCH] Libation 4.0 prep: Add legacy settings-file support. Move
 AudibleApiStorage

---
 InternalUtilities/UNTESTED/AudibleApiActions.cs       |  7 +++++++
 .../UNTESTED/AudibleApiStorage.cs                     | 11 +++++++++--
 LibationLauncher/LibationLauncher.csproj              |  2 +-
 LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs   |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)
 rename {FileManager => InternalUtilities}/UNTESTED/AudibleApiStorage.cs (69%)

diff --git a/InternalUtilities/UNTESTED/AudibleApiActions.cs b/InternalUtilities/UNTESTED/AudibleApiActions.cs
index 29578cfe..20331e7c 100644
--- a/InternalUtilities/UNTESTED/AudibleApiActions.cs
+++ b/InternalUtilities/UNTESTED/AudibleApiActions.cs
@@ -12,6 +12,13 @@ namespace InternalUtilities
 {
 	public static class AudibleApiActions
 	{
+		public static async Task<Api> GetApiAsyncLegacy30(ILoginCallback loginCallback = null)
+		{
+			Localization.SetLocale(Configuration.Instance.LocaleCountryCode);
+
+			return await EzApiCreator.GetApiAsync(AudibleApiStorage.AccountsSettingsFileLegacy30, null, loginCallback);
+		}
+
 		/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
 		public static async Task<Api> GetApiAsync(ILoginCallback loginCallback = null)
 		{
diff --git a/FileManager/UNTESTED/AudibleApiStorage.cs b/InternalUtilities/UNTESTED/AudibleApiStorage.cs
similarity index 69%
rename from FileManager/UNTESTED/AudibleApiStorage.cs
rename to InternalUtilities/UNTESTED/AudibleApiStorage.cs
index d3acbc64..141531a7 100644
--- a/FileManager/UNTESTED/AudibleApiStorage.cs
+++ b/InternalUtilities/UNTESTED/AudibleApiStorage.cs
@@ -1,10 +1,17 @@
-using Newtonsoft.Json;
+using System;
 using System.IO;
+using System.Linq;
+using AudibleApi;
+using FileManager;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
-namespace FileManager
+namespace InternalUtilities
 {
 	public static class AudibleApiStorage
 	{
+		public static string AccountsSettingsFileLegacy30 => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
+
 		public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json");
 
 		public static string GetJsonPath(
diff --git a/LibationLauncher/LibationLauncher.csproj b/LibationLauncher/LibationLauncher.csproj
index 14981f57..4940bc7f 100644
--- a/LibationLauncher/LibationLauncher.csproj
+++ b/LibationLauncher/LibationLauncher.csproj
@@ -13,7 +13,7 @@
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>3.1.12.82</Version>
+    <Version>3.1.12.86</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs b/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs
index 52127d56..43968ad6 100644
--- a/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs
+++ b/LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Windows.Forms;
 using Dinah.Core;
 using FileManager;
+using InternalUtilities;
 
 namespace LibationWinForms.Dialogs
 {