From 91c95c3f15eeb006e4c8c0e04b95554ed6f77cba Mon Sep 17 00:00:00 2001 From: Patrick Simpson Date: Tue, 2 Oct 2018 10:52:21 +0300 Subject: [PATCH] [KOE-177] Made version parsing less strict --- src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs | 2 +- src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushVersion.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs index 5b14eff..8272563 100644 --- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs +++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs @@ -147,7 +147,7 @@ namespace Acacia.ZPush ZPushVersion = ZPushVersion.FromString(response.ZPushVersion); ServerSignaturesHash = response.SignaturesHash; Confirmed = Capabilities == null ? ConfirmationType.IsNotZPush : ConfirmationType.IsZPush; - Logger.Instance.Info(this, "ZPush confirmation: {0} -> {1}, {2}", Confirmed, Capabilities, GABFolder); + Logger.Instance.Info(this, "ZPush confirmation: {0} -> {1}, {2}, {3} -> {4}", Confirmed, Capabilities, GABFolder, response.ZPushVersion, ZPushVersion); _confirmedChanged?.Invoke(this); } diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushVersion.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushVersion.cs index 984264f..3658c41 100644 --- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushVersion.cs +++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushVersion.cs @@ -45,7 +45,7 @@ namespace Acacia.ZPush try { - Match match = new Regex(@"(\d+)[.](\d+)[.](\d+)[.]").Match(version); + Match match = new Regex(@"(\d+)[.](\d+)[.]").Match(version); if (match.Success) { int major = int.Parse(match.Groups[1].Value);