#323 Handle failure in agreeing to Tumblr privacy consent

johanneszab · Dec 8, 2018 · c9c5b2a · c9c5b2a
1 parent 1662200
commit c9c5b2a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs b/src/TumblThree/TumblThree.Applications/Properties/Resources.Designer.cs
diff --git 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
@@ -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)
             {