Display warning message when auto-update fails and app is installed

witcher112 · witcher112 · commit 35046f473bde · 2017-08-04T22:12:38.000+02:00
diff --git a/Assets/PatchKit Patcher/Patcher.unity b/Assets/PatchKit Patcher/Patcher.unity
@@ -728,7 +728,7 @@ RectTransform:
   - {fileID: 1882944059}
   - {fileID: 1895841004}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -870,6 +870,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   LogServerUrl: http://test.patchkit.net
   SendDelaySeconds: 15
+  IgnoreEditorErrors: 1
 --- !u!1 &421519242
 GameObject:
   m_ObjectHideFlags: 0
@@ -1029,6 +1030,92 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+--- !u!1 &477218054
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 477218055}
+  - 222: {fileID: 477218058}
+  - 114: {fileID: 477218057}
+  - 114: {fileID: 477218056}
+  m_Layer: 5
+  m_Name: Warning
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &477218055
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 477218054}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 776156508}
+  m_RootOrder: 7
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -280, y: -109.80002}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &477218056
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 477218054}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa71e577e8cfe47b8aff3e1c254d0edf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Text: {fileID: 477218057}
+--- !u!114 &477218057
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 477218054}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7058823, g: 0.5111562, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: a31f75b6c995ad2449719ba320763782, type: 3}
+    m_FontSize: 11
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: Unable to check for updates.
+--- !u!222 &477218058
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 477218054}
 --- !u!1 &498869790
 GameObject:
   m_ObjectHideFlags: 0
@@ -1199,7 +1286,7 @@ RectTransform:
   - {fileID: 2086281416}
   - {fileID: 1428188495}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -1312,7 +1399,7 @@ RectTransform:
   m_Children:
   - {fileID: 59275200}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 275, y: 172}
@@ -1578,7 +1665,7 @@ RectTransform:
   - {fileID: 1198658945}
   - {fileID: 1141377189}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -1000}
@@ -1673,7 +1760,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 776156508}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -280, y: -114}
@@ -1811,6 +1898,7 @@ RectTransform:
   - {fileID: 1927476306}
   - {fileID: 870074901}
   - {fileID: 50408493}
+  - {fileID: 477218055}
   - {fileID: 764284243}
   - {fileID: 1869918834}
   - {fileID: 1274297495}
@@ -2132,7 +2220,7 @@ RectTransform:
   m_Children:
   - {fileID: 1498076102}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 248, y: 172}
@@ -3507,7 +3595,7 @@ RectTransform:
   - {fileID: 1627480853}
   - {fileID: 1026572724}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 30}
@@ -4314,7 +4402,7 @@ RectTransform:
   m_Children:
   - {fileID: 1769712922}
   m_Father: {fileID: 776156508}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 260.99997, y: -106.5}
diff --git a/Assets/PatchKit Patcher/Scripts/Patcher.cs b/Assets/PatchKit Patcher/Scripts/Patcher.cs
@@ -28,8 +28,11 @@ public enum UserDecision
             None,
             RepairApp,
             StartApp,
+            StartAppAutomatically,
             InstallApp,
-            CheckForAppUpdates
+            InstallAppAutomatically,
+            CheckForAppUpdates,
+            CheckForAppUpdatesAutomatically
         }
 
         private static readonly DebugLogger DebugLogger = new DebugLogger(typeof(Patcher));
@@ -123,6 +126,13 @@ public IReadOnlyReactiveProperty<PatcherData> Data
         {
             get { return _data; }
         }
+        
+        private readonly ReactiveProperty<string> _warning = new ReactiveProperty<string>();
+
+        public IReadOnlyReactiveProperty<string> Warning
+        {
+            get { return _warning; }
+        }
 
         public void SetUserDecision(UserDecision userDecision)
         {
@@ -464,7 +474,7 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
                 {
                     DebugLogger.Log("Automatically deciding to install app.");
                     _hasAutomaticallyInstalledApp = true;
-                    _userDecision = UserDecision.InstallApp;
+                    _userDecision = UserDecision.InstallAppAutomatically;
                     return;
                 }
 
@@ -473,15 +483,15 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
                 {
                     DebugLogger.Log("Automatically deciding to check for app updates.");
                     _hasAutomaticallyCheckedForAppUpdate = true;
-                    _userDecision = UserDecision.CheckForAppUpdates;
+                    _userDecision = UserDecision.CheckForAppUpdatesAutomatically;
                     return;
                 }
 
                 if (_canStartApp.Value && _configuration.AutomaticallyStartApp && !_hasAutomaticallyStartedApp)
                 {
                     DebugLogger.Log("Automatically deciding to start app.");
                     _hasAutomaticallyStartedApp = true;
-                    _userDecision = UserDecision.StartApp;
+                    _userDecision = UserDecision.StartAppAutomatically;
                     return;
                 }
 
@@ -518,8 +528,12 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
 
         private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
         {
+            bool displayWarningInsteadOfError = false;
+            
             try
             {
+                _warning.Value = string.Empty;
+                
                 DebugLogger.Log(string.Format("Executing user decision {0}...", _userDecision));
 
                 switch (_userDecision)
@@ -528,12 +542,21 @@ private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
                         break;
                     case UserDecision.RepairApp:
                         break;
+                    case UserDecision.StartAppAutomatically:
                     case UserDecision.StartApp:
                         ThreadStartApp();
                         break;
+                    case UserDecision.InstallAppAutomatically:
+                        displayWarningInsteadOfError = _app.IsInstalled();
+                        ThreadUpdateApp(cancellationToken);
+                        break;
                     case UserDecision.InstallApp:
                         ThreadUpdateApp(cancellationToken);
                         break;
+                    case UserDecision.CheckForAppUpdatesAutomatically:
+                        displayWarningInsteadOfError = _app.IsInstalled();
+                        ThreadUpdateApp(cancellationToken);
+                        break;
                     case UserDecision.CheckForAppUpdates:
                         ThreadUpdateApp(cancellationToken);
                         break;
@@ -585,7 +608,14 @@ private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
                     "Error while executing user decision {0}: an exception has occured.", _userDecision));
                 DebugLogger.LogException(exception);
 
-                ThreadDisplayError(PatcherError.Other, cancellationToken);
+                if (displayWarningInsteadOfError)
+                {
+                    _warning.Value = "Unable to check for updates. Please check your internet connection.";
+                }
+                else
+                {
+                    ThreadDisplayError(PatcherError.Other, cancellationToken);
+                }
             }
         }
 
diff --git a/Assets/PatchKit Patcher/Scripts/UI/WarningText.cs b/Assets/PatchKit Patcher/Scripts/UI/WarningText.cs
@@ -0,0 +1,20 @@
+﻿using System;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace PatchKit.Unity.Patcher.UI
+{
+    public class WarningText : MonoBehaviour
+    {
+        public Text Text;
+
+        private void Start()
+        {
+            Patcher.Instance.Warning.ObserveOnMainThread().Subscribe(warning =>
+            {
+                Text.text = warning;
+            }).AddTo(this);
+        }
+    }
+}
diff --git a/Assets/PatchKit Patcher/Scripts/UI/WarningText.cs.meta b/Assets/PatchKit Patcher/Scripts/UI/WarningText.cs.meta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Using geolocation to find closest http server available
 - Decides on torrents based on publish_method remote app property
 
+### Changed
+- Display warning message when auto-update fails and app is installed
+
 ### Fixed
 - HTTP downloader resumes the download on error
 - Moving files after installation instead of copying them
