Merge branch 'dev/v3.17.9.x' into dev/v3.17.x.x

Author: witcher112

Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/ChunkedFileStream.cs

@@ -188,14 +188,18 @@ public void Write([NotNull] byte[] buffer, int offset, int count)
 
                 if (ChunkFullyInBuffer())
                 {
-                    if (BufferedChunkValid())
+                    byte[] bufferHash = _hashFunction(_buffer, 0, (int) Math.Min(_chunksData.ChunkSize, RemainingLength));
+                    byte[] chunkHash = _chunksData.Chunks[_chunkIndex + _startChunk].Hash;
+                    
+                    if (BufferedChunkValid(bufferHash, chunkHash))
                     {
                         FlushBuffer();
                     }
                     else
                     {
                         DiscardBuffer();
-                        throw new InvalidChunkDataException("Invalid chunk data.");
+                        throw new InvalidChunkDataException("Invalid chunk data. Expected " +
+                                                            BitConverter.ToString(chunkHash) + ", got " + BitConverter.ToString(bufferHash));
                     }
                 }
             } while (count > 0);
@@ -206,11 +210,8 @@ private bool ChunkFullyInBuffer()
             return _bufferPos == Math.Min(_chunksData.ChunkSize, RemainingLength);
         }
 
-        private bool BufferedChunkValid()
+        private bool BufferedChunkValid(byte[] bufferHash, byte[] chunkHash)
         {
-            byte[] bufferHash = _hashFunction(_buffer, 0, (int) Math.Min(_chunksData.ChunkSize, RemainingLength));
-            byte[] chunkHash = _chunksData.Chunks[_chunkIndex + _startChunk].Hash;
-
             return bufferHash.SequenceEqual(chunkHash);
         }
 

Assets/PatchKit Patcher/Scripts/UI/ScreenScale.cs

@@ -13,11 +13,11 @@ public static float Value
         {
             float screenScale;
             float screenDpi = Screen.dpi;
-            if (screenDpi >= 400)
+            if (screenDpi >= 384)
             {
                 screenScale = 4;
             }
-            else if (screenDpi >= 200)
+            else if (screenDpi >= 192)
             {
                 screenScale = 2;
             }

CHANGELOG.md

@@ -11,6 +11,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Retrying the failed operation from error dialog
 
+## [3.17.9.3]
+### Added
+- More information about invalid chunk data exception
+
+## [3.17.9.2]
+### Changed
+- HDPI scale thresholds
+
+## [3.17.9.1]
+### Changed
+- HDPI scale thresholds
+
 ## [3.17.9.0]
 ### Added
 - Support HDPI for debug menu