From 86a4b2a14d71fcae440d3e76824fd608ca02f750 Mon Sep 17 00:00:00 2001 From: Khaddar Date: Sat, 30 Apr 2016 20:43:24 +0100 Subject: [PATCH] Initial fix attempt for IOS8 Don't treat domains com.apple.TextEncoding or com.apple.assetsd as files, just discard them and proceed. --- ItunesBackupFileExtractor/MbdbExtract.cs | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ItunesBackupFileExtractor/MbdbExtract.cs b/ItunesBackupFileExtractor/MbdbExtract.cs index 17d7531..33fe657 100644 --- a/ItunesBackupFileExtractor/MbdbExtract.cs +++ b/ItunesBackupFileExtractor/MbdbExtract.cs @@ -1,4 +1,6 @@ -using System; +#define DEBUG + +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -49,11 +51,22 @@ public static List ReadMBDB(string iTunesBackupFolder) byte[] sha1Buffer = sha1Crypt.ComputeHash(ASCIIEncoding.UTF8.GetBytes(string.Format("{0}-{1}", MbdbFile.Domain, MbdbFile.FilePath))); MbdbFile.EncryptedFilename = GetHexStringByByteArray(sha1Buffer); - //Add MbdbFile to list - mbdbFiles.Add(MbdbFile); +#if DEBUG + if (MbdbFile.Domain.StartsWith("com.apple.TextEncoding") || MbdbFile.Domain.StartsWith("com.apple.assetsd")) + { + //Do we need to do anything here?? + } + else + { +#endif + //Add MbdbFile to list + mbdbFiles.Add(MbdbFile); - //Ignoring the rest - NextFile(fs); + //Ignoring the rest + NextFile(fs); +#if DEBUG + } +#endif } return mbdbFiles;