From c81d6ed82d1fac81e06edc1f91d3b53fc5d04e3f Mon Sep 17 00:00:00 2001 From: ScottIsAFool Date: Wed, 11 Dec 2013 07:23:36 +0000 Subject: [PATCH] Fixed a few things when coming from web --- PocketWP/PocketHelper.cs | 21 ++++++++++++--------- PocketWP/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/PocketWP/PocketHelper.cs b/PocketWP/PocketHelper.cs index 3f91ec5..77b4a70 100644 --- a/PocketWP/PocketHelper.cs +++ b/PocketWP/PocketHelper.cs @@ -10,7 +10,7 @@ namespace PocketWP public static class PocketHelper { private const string PocketScheme = "pocket:"; - private const string PocketUrl = PocketScheme + "Add?item="; + private const string PocketUrl = PocketScheme + "Add?"; /// /// Adds a single item to Pocket @@ -89,7 +89,8 @@ namespace PocketWP /// True if pocket data is present public static bool HasPocketData(Uri uri) { - return uri.ToString().Contains(Uri.EscapeDataString(PocketUrl)); + var escapedProtocol = Uri.EscapeDataString(PocketUrl); + return uri.ToString().Contains(escapedProtocol); } /// @@ -105,18 +106,20 @@ namespace PocketWP if (queryString.ContainsKey("source")) { - var urlToAdd = queryString["Url"] ?? string.Empty; - var title = queryString["Title"] ?? string.Empty; + var urlToAdd = queryString.ContainsKey("Url") ? queryString["Url"] : string.Empty; + var title = queryString.ContainsKey("Title") ? queryString["Title"] : string.Empty; + + var pocketItem = new PocketDataItem + { + Uri = Uri.UnescapeDataString(urlToAdd), + Title = Uri.UnescapeDataString(title) + }; var item = new PocketData { Items = new List { - new PocketDataItem - { - Uri = Uri.UnescapeDataString(urlToAdd), - Title = Uri.UnescapeDataString(title) - } + pocketItem } }; diff --git a/PocketWP/Properties/AssemblyInfo.cs b/PocketWP/Properties/AssemblyInfo.cs index 35bbe0f..b9e8fba 100644 --- a/PocketWP/Properties/AssemblyInfo.cs +++ b/PocketWP/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Resources; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.5")] -[assembly: AssemblyFileVersion("1.0.0.5")] +[assembly: AssemblyVersion("1.0.0.6")] +[assembly: AssemblyFileVersion("1.0.0.6")] [assembly: NeutralResourcesLanguageAttribute("en-US")]