From c9c5b2ab4640ca6c3e06628e7b895cb7c5f0566f Mon Sep 17 00:00:00 2001
From: Johannes Meyer zum Alten Borgloh <code@jzab.de>
Date: Sat, 8 Dec 2018 21:37:02 +0100
Subject: [PATCH] #323 Handle failure in agreeing to Tumblr privacy consent

---
 .../Properties/Resources.Designer.cs          | 20 ++++++++++++++++++-
 .../Properties/Resources.resx                 |  8 +++++++-
 .../Services/ConfirmTumblrPrivacyConsent.cs   |  5 ++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs b/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs
index 9e373f6..ae6dcb9 100644
--- a/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs
+++ b/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs
@@ -151,7 +151,16 @@ public static string Body {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Confirming the Tumblr privacy consent failed. There might a connection issue..
+        ///   Looks up a localized string similar to confirming to the Tumblr privacy consent.
+        /// </summary>
+        public static string ConfirmingTumblrPrivacyConsent {
+            get {
+                return ResourceManager.GetString("ConfirmingTumblrPrivacyConsent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Confirming to the Tumblr privacy consent failed. There might be a connection issue..
         /// </summary>
         public static string ConfirmingTumblrPrivacyConsentFailed {
             get {
@@ -746,6 +755,15 @@ public static string TimeoutReached {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to A connection timeout occured during {0}..
+        /// </summary>
+        public static string TimeoutReachedShort {
+            get {
+                return ResourceManager.GetString("TimeoutReachedShort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Title: {0}.
         /// </summary>
diff --git a/src/TumblThree/TumblThree.Applications/Properties/Resources.resx b/src/TumblThree/TumblThree.Applications/Properties/Resources.resx
index 56e1397..268ec8e 100644
--- a/src/TumblThree/TumblThree.Applications/Properties/Resources.resx
+++ b/src/TumblThree/TumblThree.Applications/Properties/Resources.resx
@@ -147,8 +147,11 @@
   <data name="Body" xml:space="preserve">
     <value>Body: {0]</value>
   </data>
+  <data name="ConfirmingTumblrPrivacyConsent" xml:space="preserve">
+    <value>confirming to the Tumblr privacy consent</value>
+  </data>
   <data name="ConfirmingTumblrPrivacyConsentFailed" xml:space="preserve">
-    <value>Confirming the Tumblr privacy consent failed. There might a connection issue.</value>
+    <value>Confirming to the Tumblr privacy consent failed. There might be a connection issue.</value>
   </data>
   <data name="Conversation" xml:space="preserve">
     <value>Conversation: {0}</value>
@@ -347,6 +350,9 @@
   <data name="TimeoutReached" xml:space="preserve">
     <value>A connection timeout occured during {0} of {1}.</value>
   </data>
+  <data name="TimeoutReachedShort" xml:space="preserve">
+    <value>A connection timeout occured during {0}.</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>Title: {0}</value>
   </data>
diff --git a/src/TumblThree/TumblThree.Applications/Services/ConfirmTumblrPrivacyConsent.cs b/src/TumblThree/TumblThree.Applications/Services/ConfirmTumblrPrivacyConsent.cs
index 44d573f..6a53e3b 100644
--- a/src/TumblThree/TumblThree.Applications/Services/ConfirmTumblrPrivacyConsent.cs
+++ b/src/TumblThree/TumblThree.Applications/Services/ConfirmTumblrPrivacyConsent.cs
@@ -36,10 +36,9 @@ public async Task ConfirmPrivacyConsentAsync()
             }
             catch (TimeoutException timeoutException)
             {
-                const string message = "confirming the Tumblr privacy consent";
-                Logger.Error("{0}, {1}", string.Format(CultureInfo.CurrentCulture, Resources.TimeoutReached, message),
+                Logger.Error("{0}, {1}", string.Format(CultureInfo.CurrentCulture, Resources.TimeoutReachedShort, Resources.ConfirmingTumblrPrivacyConsent),
                     timeoutException);
-                shellService.ShowError(timeoutException, Resources.TimeoutReached, message);
+                shellService.ShowError(timeoutException, Resources.ConfirmingTumblrPrivacyConsentFailed);
             }
             catch (Exception exception)
             {