Merge pull request #588 from Mbucari/master

Use old activation bytes if present.
rmcrackan · Apr 18, 2023 · ea9e36f · ea9e36f
2 parents 48c69a1 + fe534b3
commit ea9e36f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Source/AaxDecrypter/AaxcDownloadConvertBase.cs b/Source/AaxDecrypter/AaxcDownloadConvertBase.cs
@@ -32,7 +32,11 @@ public override async Task CancelAsync()
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
-			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+
+			if (DownloadOptions.AudibleKey?.Length == 8 && DownloadOptions.AudibleIV is null)
+				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey);
+			else
+				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 
 			if (DownloadOptions.StripUnabridged)
 			{

diff --git a/Source/AaxDecrypter/AudiobookDownloadBase.cs b/Source/AaxDecrypter/AudiobookDownloadBase.cs
@@ -182,7 +182,6 @@ private async Task<bool> CleanupAsync()
 			FileUtility.SaferDelete(jsonDownloadState);
 
 			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
-				!string.IsNullOrEmpty(DownloadOptions.AudibleIV) &&
 				DownloadOptions.RetainEncryptedFile)
 			{
 				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");

diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="8.3.0.1" />
+    <PackageReference Include="AudibleApi" Version="8.4.0.1" />
   </ItemGroup>
 
   <ItemGroup>