diff --git a/src/KeePassLib2Android/KeePassLib2Android.csproj b/src/KeePassLib2Android/KeePassLib2Android.csproj index f100ebca..763e2040 100644 --- a/src/KeePassLib2Android/KeePassLib2Android.csproj +++ b/src/KeePassLib2Android/KeePassLib2Android.csproj @@ -162,10 +162,6 @@ {70D3844A-D9FA-4A64-B205-A84C6A822196} KP2AKdbLibraryBinding - - {6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB} - ZlibAndroid - diff --git a/src/KeePassLib2Android/Serialization/KdbxFile.Read.cs b/src/KeePassLib2Android/Serialization/KdbxFile.Read.cs index 46477729..d5d82fab 100644 --- a/src/KeePassLib2Android/Serialization/KdbxFile.Read.cs +++ b/src/KeePassLib2Android/Serialization/KdbxFile.Read.cs @@ -114,7 +114,7 @@ namespace KeePassLib.Serialization !m_bRepairMode); if(m_pwDatabase.Compression == PwCompressionAlgorithm.GZip) - readerStream = new Ionic.Zlib.GZipStream(sHashed, Ionic.Zlib.CompressionMode.Decompress); + readerStream = new GZipStream(sHashed, CompressionMode.Decompress); else readerStream = sHashed; } else if(kdbFormat == KdbxFormat.PlainXml) diff --git a/src/KeePassLib2Android/Serialization/KdbxFile.Write.cs b/src/KeePassLib2Android/Serialization/KdbxFile.Write.cs index c601f3c9..a61e9bef 100644 --- a/src/KeePassLib2Android/Serialization/KdbxFile.Write.cs +++ b/src/KeePassLib2Android/Serialization/KdbxFile.Write.cs @@ -115,7 +115,7 @@ namespace KeePassLib.Serialization Stream sHashed = new HashedBlockStream(sEncrypted, true); if(m_pwDatabase.Compression == PwCompressionAlgorithm.GZip) - writerStream = new Ionic.Zlib.GZipStream(sHashed, Ionic.Zlib.CompressionMode.Compress); + writerStream = new GZipStream(sHashed, CompressionMode.Compress); else writerStream = sHashed; } diff --git a/src/KeePassLib2Android/Translation/KPTranslation.cs b/src/KeePassLib2Android/Translation/KPTranslation.cs index 27a5987c..32b01089 100644 --- a/src/KeePassLib2Android/Translation/KPTranslation.cs +++ b/src/KeePassLib2Android/Translation/KPTranslation.cs @@ -103,7 +103,7 @@ namespace KeePassLib.Translation FileAccess.Write, FileShare.None); #if !KeePassLibSD - Ionic.Zlib.GZipStream gz = new Ionic.Zlib.GZipStream(fs, Ionic.Zlib.CompressionMode.Compress); + GZipStream gz = new GZipStream(fs, CompressionMode.Compress); #else GZipOutputStream gz = new GZipOutputStream(fs); #endif @@ -132,7 +132,7 @@ namespace KeePassLib.Translation FileAccess.Read, FileShare.Read); #if !KeePassLibSD - Ionic.Zlib.GZipStream gz = new Ionic.Zlib.GZipStream(fs, Ionic.Zlib.CompressionMode.Decompress); + GZipStream gz = new GZipStream(fs, CompressionMode.Decompress); #else GZipInputStream gz = new GZipInputStream(fs); #endif diff --git a/src/KeePassLib2Android/Utility/AppLogEx.cs b/src/KeePassLib2Android/Utility/AppLogEx.cs index 25e50edc..ae16f699 100644 --- a/src/KeePassLib2Android/Utility/AppLogEx.cs +++ b/src/KeePassLib2Android/Utility/AppLogEx.cs @@ -68,7 +68,7 @@ namespace KeePassLib.Utility FileStream fsOut = new FileStream(strPath, FileMode.Create, FileAccess.Write, FileShare.None); - Ionic.Zlib.GZipStream gz = new Ionic.Zlib.GZipStream(fsOut, CompressionMode.Compress); + GZipStream gz = new GZipStream(fsOut, CompressionMode.Compress); m_swOut = new StreamWriter(gz); AppLogEx.Log("Started logging on " + dtNow.ToString("s") + "."); diff --git a/src/KeePassLib2Android/Utility/MemUtil.cs b/src/KeePassLib2Android/Utility/MemUtil.cs index a5b10e47..8c2e937b 100644 --- a/src/KeePassLib2Android/Utility/MemUtil.cs +++ b/src/KeePassLib2Android/Utility/MemUtil.cs @@ -430,7 +430,7 @@ namespace KeePassLib.Utility if(pbData.Length == 0) return pbData; MemoryStream msCompressed = new MemoryStream(); - Ionic.Zlib.GZipStream gz = new Ionic.Zlib.GZipStream(msCompressed, Ionic.Zlib.CompressionMode.Compress); + GZipStream gz = new GZipStream(msCompressed, CompressionMode.Compress); MemoryStream msSource = new MemoryStream(pbData, false); MemUtil.CopyStream(msSource, gz); gz.Close(); @@ -447,7 +447,7 @@ namespace KeePassLib.Utility if(pbCompressed.Length == 0) return pbCompressed; MemoryStream msCompressed = new MemoryStream(pbCompressed, false); - Ionic.Zlib.GZipStream gz = new Ionic.Zlib.GZipStream(msCompressed, Ionic.Zlib.CompressionMode.Decompress); + GZipStream gz = new GZipStream(msCompressed, CompressionMode.Decompress); MemoryStream msData = new MemoryStream(); MemUtil.CopyStream(gz, msData); gz.Close();