From 34a9cbcec53d2c47179ebf7e11e037cd465735ae Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Thu, 27 Oct 2016 23:31:02 +0200
Subject: [PATCH 1/5] renomage ...

---
 BookAStar/BookAStar/App.xaml.cs                       |  2 +-
 BookAStar/BookAStar/Data/DataManager.cs               |  4 ++--
 .../Model/Social/Messaging/PrivateMessage.cs          |  2 +-
 BookAStar/BookAStar/Pages/ChatPage.xaml.cs            | 11 ++++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index e3e7dec3..f6df66c3 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -275,7 +275,7 @@ namespace BookAStar
             chatHubProxy = chatHubConnection.CreateHubProxy("ChatHub");
             chatHubProxy.On<string, string>("PV", (n, m) => {
                 DataManager.Current.PrivateMessages.Add(
-                    new UserMessage
+                    new ChatMessage
                     {
                         Message = m,
                         SenderId = n,
diff --git a/BookAStar/BookAStar/Data/DataManager.cs b/BookAStar/BookAStar/Data/DataManager.cs
index a6c752ff..82e676b7 100644
--- a/BookAStar/BookAStar/Data/DataManager.cs
+++ b/BookAStar/BookAStar/Data/DataManager.cs
@@ -20,7 +20,7 @@
         /// </summary>
         internal LocalEntity<EditEstimateViewModel, long> EstimationCache { get; set; }
         internal LocalEntity<BillingLine, string> EstimateLinesTemplates { get; set; }
-        internal LocalEntity<UserMessage, int> PrivateMessages { get; set; }
+        internal LocalEntity<ChatMessage, int> PrivateMessages { get; set; }
         protected static DataManager current ;
 
         public static DataManager Current 
@@ -42,7 +42,7 @@
             AppState = new LocalEntity<PageState, int>(s => s.Position);
             EstimationCache = new LocalEntity<EditEstimateViewModel, long>(e => e.Query.Id);
             EstimateLinesTemplates = new LocalEntity<BillingLine, string>(l => l.Description);
-            PrivateMessages = new LocalEntity<UserMessage, int>(m=> m.GetHashCode());
+            PrivateMessages = new LocalEntity<ChatMessage, int>(m=> m.GetHashCode());
 
             PrivateMessages.Load();
             BookQueries.Load();
diff --git a/BookAStar/BookAStar/Model/Social/Messaging/PrivateMessage.cs b/BookAStar/BookAStar/Model/Social/Messaging/PrivateMessage.cs
index 8133a1f4..8dae22c6 100644
--- a/BookAStar/BookAStar/Model/Social/Messaging/PrivateMessage.cs
+++ b/BookAStar/BookAStar/Model/Social/Messaging/PrivateMessage.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace BookAStar.Model.Social.Messaging
 {
-    public class UserMessage
+    public class ChatMessage
     {
         public DateTime Date { get; set; }
         public string SenderId { get; set; }
diff --git a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
index 214a14f9..9ffc54d2 100644
--- a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
@@ -13,7 +13,8 @@ namespace BookAStar.Pages
 {
     public partial class ChatPage : TabbedPage
     {
-        public ObservableCollection<UserMessage> Messages { get; set; }
+        public ObservableCollection<ChatMessage> Messages { get; set; }
+        public ObservableCollection<ChatMessage> Notifs { get; set; }
         public string ChatUser { get; set; }
 
         public ChatPage()
@@ -40,7 +41,7 @@ namespace BookAStar.Pages
             };
             // contactPicker.DisplayProperty = "UserName";
             
-            messageList.ItemsSource = Messages = new ObservableCollection<UserMessage>();
+            messageList.ItemsSource = Messages = new ObservableCollection<ChatMessage>();
             PVList.ItemsSource = DataManager.Current.PrivateMessages;
             App.CurrentApp.ChatHubConnection.StateChanged += ChatHubConnection_StateChanged;
             // DataManager.Current.Contacts 
@@ -50,7 +51,7 @@ namespace BookAStar.Pages
 
             App.CurrentApp.ChatHubProxy.On<string, string>("addMessage", (n, m) =>
             {
-                Messages.Add(new UserMessage
+                Messages.Add(new ChatMessage
                 {
                     Message = m,
                     SenderId = n,
@@ -58,9 +59,9 @@ namespace BookAStar.Pages
                 });
             });
 
-            App.CurrentApp.ChatHubProxy.On<string, string>("addMessage", (n, m) =>
+            App.CurrentApp.ChatHubProxy.On<string, string>("notify", (n, m) =>
             {
-                Messages.Add(new UserMessage
+                Notifs.Add(new ChatMessage
                 {
                     Message = m,
                     SenderId = n,

From f8c77bd6b15038f61263de502a9ee5b7a8ee80ef Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 29 Oct 2016 01:59:48 +0200
Subject: [PATCH 2/5] =?UTF-8?q?Implemente=20l'acc=C3=A8s=20authentifi?=
 =?UTF-8?q?=C3=A9=20au=20chat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BookAStar/BookAStar/App.xaml.cs               |  16 ++-
 BookAStar/BookAStar/BookAStar.csproj          |   7 ++
 .../Converters/BooleanToObjectConverter.cs    |   2 +-
 .../SignalRConnectionStateToObject.cs         |  42 +++++++
 BookAStar/BookAStar/Images/Chat/connected.png | Bin 0 -> 2017 bytes
 .../BookAStar/Images/Chat/connecting.png      | Bin 0 -> 2408 bytes
 .../BookAStar/Images/Chat/disconnected.png    | Bin 0 -> 1485 bytes
 .../BookAStar/Images/Chat/reconnecting.png    | Bin 0 -> 4116 bytes
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   |  24 ++--
 BookAStar/BookAStar/Pages/ChatPage.xaml       | 111 ++++++++++++------
 BookAStar/BookAStar/Pages/ChatPage.xaml.cs    |  37 +++++-
 .../ViewModels/BookQueriesViewModel.cs        |   2 +-
 12 files changed, 179 insertions(+), 62 deletions(-)
 create mode 100644 BookAStar/BookAStar/Converters/SignalRConnectionStateToObject.cs
 create mode 100644 BookAStar/BookAStar/Images/Chat/connected.png
 create mode 100644 BookAStar/BookAStar/Images/Chat/connecting.png
 create mode 100644 BookAStar/BookAStar/Images/Chat/disconnected.png
 create mode 100644 BookAStar/BookAStar/Images/Chat/reconnecting.png

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index f6df66c3..beabc53f 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -273,7 +273,7 @@ namespace BookAStar
             chatHubConnection.Error += ChatHubConnection_Error;
 
             chatHubProxy = chatHubConnection.CreateHubProxy("ChatHub");
-            chatHubProxy.On<string, string>("PV", (n, m) => {
+            chatHubProxy.On<string, string>("addPV", (n, m) => {
                 DataManager.Current.PrivateMessages.Add(
                     new ChatMessage
                     {
@@ -283,17 +283,21 @@ namespace BookAStar
                     }
                     );
             });
+            MainSettings_UserChanged(this, null);
         }
 
         private void MainSettings_UserChanged(object sender, EventArgs e)
         {
-            if (MainSettings.CurrentUser != null)
+            if (MainSettings.CurrentUser == null)
             {
-                if (chatHubConnection.Headers.ContainsKey("Bearer"))
-                    chatHubConnection.Headers.Remove("Bearer");
-                chatHubConnection.Headers.Add("Bearer", MainSettings.CurrentUser.YavscTokens.AccessToken);
+                chatHubConnection.Headers.Clear();
+            }
+            else
+            {
+                var token = MainSettings.CurrentUser.YavscTokens.AccessToken;
+                chatHubConnection.Headers.Add(
+                    "Authorization", $"Bearer {token}");
             }
-            else chatHubConnection.Headers.Remove("Bearer");
         }
 
         private void ChatHubConnection_Error(Exception obj)
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index 9a7cf243..8dba105c 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -48,6 +48,7 @@
     <Compile Include="Behaviors\PickerBehavior.cs" />
     <Compile Include="Behaviors\StarBehavior.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Converters\SignalRConnectionStateToObject.cs" />
     <Compile Include="Data\LocalState.cs" />
     <Compile Include="Model\Social\Messaging\ChatStatus.cs" />
     <Compile Include="Model\Social\Messaging\PrivateMessage.cs" />
@@ -376,6 +377,12 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\Chat\connected.png" />
+    <Content Include="Images\Chat\connecting.png" />
+    <Content Include="Images\Chat\disconnected.png" />
+    <Content Include="Images\Chat\reconnecting.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/BookAStar/BookAStar/Converters/BooleanToObjectConverter.cs b/BookAStar/BookAStar/Converters/BooleanToObjectConverter.cs
index 97c4df0e..8cd28a88 100644
--- a/BookAStar/BookAStar/Converters/BooleanToObjectConverter.cs
+++ b/BookAStar/BookAStar/Converters/BooleanToObjectConverter.cs
@@ -8,7 +8,7 @@ using Xamarin.Forms;
 
 namespace BookAStar.Converters
 {
-    class BooleanToObjectConverter<T> : IValueConverter
+    public class BooleanToObjectConverter<T> : IValueConverter
     {
         public T FalseObject { set; get; }
 
diff --git a/BookAStar/BookAStar/Converters/SignalRConnectionStateToObject.cs b/BookAStar/BookAStar/Converters/SignalRConnectionStateToObject.cs
new file mode 100644
index 00000000..21ba1efa
--- /dev/null
+++ b/BookAStar/BookAStar/Converters/SignalRConnectionStateToObject.cs
@@ -0,0 +1,42 @@
+using Microsoft.AspNet.SignalR.Client;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Converters
+{
+    public class SignalRConnectionStateToObject<T> : IValueConverter
+    {
+        public T ConnectedObject { set; get; }
+
+        public T ConnectingObject { set; get; }
+
+        public T DisconnectedObject { set; get; }
+
+        public T ReconnectingObject { set; get; }
+
+        public object Convert(object value, Type targetType,
+                              object parameter, CultureInfo culture)
+        {
+            switch ((ConnectionState)value) {
+                case ConnectionState.Connected: return ConnectedObject;
+                case ConnectionState.Connecting: return ConnectingObject;
+                case ConnectionState.Disconnected: return DisconnectedObject;
+                case ConnectionState.Reconnecting: return ReconnectingObject;
+            }
+            Debug.Assert(false);
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType,
+                                  object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Images/Chat/connected.png b/BookAStar/BookAStar/Images/Chat/connected.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b9883e67511872762fabac71374f2dff506a5ef
GIT binary patch
literal 2017
zcmV<72Oju|P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;0hcU5GQ<2Q)>VK2X0A3
zK~!ko?V4*$RNEDR*BJx{D~cCsM4pZ!YJIdqL<JugTa8{t8(QFp)>5sll2)t<{!oJ&
zOf<GOW@3dZA*PlPkSI~9rj43FK&_I>70YcKHBx1I>jbnE!sYSx59j3U8C0g}?Hmj%
zImygk`<$%rto>MP?ISWOqcSQZS+tQ308AB;^&+xDL?(&Iry^3UY1)$y%2U9%fa^d%
z-qHzd_)tLOfZur%wzai!|NedY`wjljfsaNy>_*^UI#G9bH%_OMMT-_;v)K?4va_?z
z?;&F(!+sy=Gt(?vwhR$buE@wpbC;itRM=1Sx!T>`O;J%16%`fO?REt=E-sFX7cVOB
z#ELL>;M>4ypaFORxPcbnH^4#Q4M1mSC#k8a2H^Vj>q$&ZBsVvgrluy(Y5jXZvl8eS
z;HQId@0Edp0WvZ&6pz-{)(+LR5BN0@ZY9_l;E&2a(%DH}T^%JQB@`DIbM@*~+S}U=
z{h2do6xf|RcY1<81`YtTtTu#WfG4_@&CShZW@dWLM-jnhv$1yVTI%cT$;!$y+SjaE
zLtme<esv5kXqpx0>qo$6x}{F1ld)sRdVzXgnx+vG6T`xV3(3sPG<*KvK$2Bg+Cboz
zZfRj*p%++aXeg<vsidW)5fv5XrC+{$IRgU&=3$&^<*lVexAMY;3uu~VfJ~V(h4S)p
z^DqVA)~#F2nKMU$E-o%McUfaq*nHi>y1F`L7$+no(AwJi*44SQvy+sR6lD~2bad$I
zD^`Tvqz4U8o;)EuJY4bYvuDrVyCt=?wGkQ`YTQ>;RHUoE047)ocHv;=LPtl3GCYHW
zgSm6(4#SnaygcLH^z?M=MN`06fxiRv_V%)R^=f6+EiW&}7rA!rnsL9w;V`RmtO9&i
zw`kX{UCP39<j4_xm4=1}Wh$8D$5w!ypvS+})zu2@=FOWux0Yc^RaKSojQIF?vucYk
zw%NV}*c=i0tB8b%h*VWo8M;}sX34p8=S0(d4~ni|zi#|quwa2%^%qNQKf3JQyH}aJ
z2M-?f*~2X@ElTKl{``4e)dkr71^YeS3YW`8Mn(o<VPPaCB`I5qh>(?)MORnXuwc8o
zx=2b&Qs!@Wcek!C_ZMvP;M?ZSn>Wm#KVJb13=AY9B0_0PPEN+<a=jC_zrWurCA@U$
zlDW$wf5659E`YwiKGv;U_tpep+O%m(TWoCXP>H)C`T6-u|Gd0Bv%1V5upxk9ac*v|
zV&Il7Ta?I3M3_B$w({R@w^LSD<^}6?I+cFe+1ci~|Lp%>kpu#OYq|x;k01Af9T*tk
z#fujtCMGJnsHiB$j2WYNzo4MNfUT~sCLka{8UCg@{|1=v5AXic7+Ym!O7^pI<w|;b
zdXxlU<Hn5&bXZszAt513TTV_6_wL<O+M}bRdHM3CxqS19KVa7b19}7$92{&IIAg{P
zUcGuXWKF7|pg;i}H*Or0Cr|cT;LP#%-Me?qkJ;_7dD{lycDt2CJtQQAhYugVbLBmC
z>Xb5E0|Ntzi;Ej_k*lbvFyHzse{DfO(=Eu(&Nd7T2ngWHl`F&ATWe}+m@r|20+^7H
zpunCydD47KHDL1>@SpYQ$2@P39XsYz^wiYUL~LxV0=<9#e$Jjf%cDn+%w7KkjQ1C8
zv~I<|eftbU=gpgEKExWfxLht~&YY<v79R2li1}YK_&Q9!uK%d7uQwXEZQCX`o9`p8
zxw%=MK7DHZkB*Kus}G3CLQT`2`!hM%uD|-o$VkI8w{PF}*}E+*Elip;$#_P1c({4{
zY5cMnZ2xV4z-aU}-E+I$vSGspX>V^A5fQuHE|)J~mWYT5z01$7RFDH;$&w|8cTS%^
zJ#5eR^z^V|#fo>8drGWSl$&8h0K0b^MlW8xc-T2^PEL-pG8YyWDy3*3$ZBQRrvMKg
zJWvcTDJgj`?9rn~m3y{s-D*~UX30+!fJ3^4>FMc)@j*dBl$Mqb3EJD+%b`Pu6j+aV
z+YQXL>M6qH!2&p~t*u@WQ*v@LPN$O_H*Qc<Q^Sc9CzL2kkE+~mx4D@9v6at=4w$`n
z`0(NPp8lDy>C>n4{P}b9BYt3I*dOZ0CXXLKCO$r%i4!N1nVHGlxpUup<hgzOcJsLq
zz#*%Geg*i2o)UI+bST4AKaFo{YGTixJuF?i6o<os!{Hz$C58O_d|Fyslxz_=XhqO(
z04ITen5&4%$;rwo{mq*<eF?H&TJ9@3Abjw{kUmdqOG`_Yp=vJ8=#|U2NHee-2(cQh
z2K>QXDy^-pWz(ijI2;br($b8yaL0}v<}B%Nz$74kFe3Zz;Pp))+R6*la-E>EvQkMB
zM1=9<$J5x@NJB$|*?XS@^JFB-;I~r%Or1K_YqcFBXKe$%CL>jV@8~4@r$RwNL9AM}
zipt7L&zSjBAYMkY0AavC_4(V_*vRYGuRXo`#o#s-EFXdZ>H4P%o@ZOYZ-E&jl}&pG
zv_nLGBqH-g#3drvMdX^MX`M1EqcSR^;wSkJSt?kx)-9Xf00000NkvXXu0mjfz_!$R

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/Chat/connecting.png b/BookAStar/BookAStar/Images/Chat/connecting.png
new file mode 100644
index 0000000000000000000000000000000000000000..99e7fe8c2eb3b055b6adf12e520428ff232a2afa
GIT binary patch
literal 2408
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
aBmV_E)+FP}F&+^B0000<MNUMnLSTZg$6(R`

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/Chat/disconnected.png b/BookAStar/BookAStar/Images/Chat/disconnected.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f24a536a326548a2b553ed7fcb1a5d3ab36c9e
GIT binary patch
literal 1485
zcmV;;1v2`HP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;0hcU5C=yfbE5zN1zJf&
zK~!ko?U`>#Rc9Q>fA=a^Gre}jWiqZgTV+Z*A$n7j)huJ{#SL08wyW<1Sy8!2N)QK`
zdy&4-UNqRM5ki3$i&$K8iGM;^j@dAXc2Pr$TISVs=DgSY*^Axt>>U48Zm=EYeBr`5
z=XuV(zt8jh?(fezB9<&!vSi7UB}<kpS+Zowk|j%)ELoaYKoXD(IF~x;3ZMz2z5(Kw
z>aN~nZhg1ZU>!iKMmIJ#MpIK0qobpG==`Mw{Iy0E2n5)$VFMz<p+krCz!!jzfYply
zDjui+ev1H%1I>Easi`Rn3JMSrM1+QhhPmAP58$}jVbcIVuTXJuv4SlsDk2;Xzij%)
zW`%X>gVD{KH>s$o;PmO!Jb(UNS%2ch2?e`t+cu`ArqtNer%&;Ey&O4mgit7?UG6j^
zY!vXlX5pz*r?A;<3T)lFb=<#ypT@>Ub$#vHwLE+FOu<f0PO^3DR&`Hzcege)Y)0UE
z&AR61X6$ymGF<yOolYDM2O@&Y<>KDGzcW)f9LDSQs=4Xu>AZOHLL2_cY_OkcmUVY`
z6Bie!3{Of*GVHX75FH&&TU(pqPg+@7sm5n622gG$*g_x(;P?AUPEMX>_~px&S-yO^
z0lK85gkUiER}Q*xK`ly5Ow7#1=l~pMfz1X+07gbe$jZu6Kr;>R>FL4kb{n8~?%avb
z=OZ>YR$V)H?wlUB*EBUY-~{>rg25n#g@p!~8HNM!@Zm!?ZQ5j*7Znwyj?2r-_0xxe
zOf$LiSDIx<j~+EZl$Djun@~qbN7=P&*Q|h+pP#Q!Lt)@UGr?v7(*Qo7&k&S69uL#g
z(=RPLLZJ}*_wP3V$Hm2Q<;oTPv>G!3pV17@$jDGeZ``<%@$qq9R}BpfL`O%f`|Wl+
zEiEnD@b5r^S%4n{T)leLkZSJSxx+$r{rYvBPN({w-Me?|hx7gm9{Vd`GejgsM8xOw
zsp}q(M{;s<7W`w|w{Ms1>}+*DIXS5xPW<12MdU5*ptrZzVE8{#NlA%xb#<xpqM{=0
za7sjeHiJ8Vp!wV8&6|}gUb=K?!R~zW<jGmZh)&IB`TxGBS+rxv4rOdzUEP9Uo0^&o
z^>#r)fxc@R0@BO^oT^z>R#s-HnqF78Z{If5+nJe}1OfroGy(6LtyvfVXm4*fq?C@1
zj#t7C4i1u<nyT(gPEN+}_v;IePtDj0eyO!|d3kxt_>`0s?%usSFYJQ{4_Lo`y_)ZE
zIB0Kg*H8Jv%#U$`ntSSthxqt-s;jFFjs4Kj5cT!-xLhtnkUD?<ydJg@u$dM3Z9sMB
zrKP2_YGb?IPFh+TZnt|@KP)2D)YQyu0b|Vk5d9a;rR(bI*t2I3ZnxX8)AM~26B9Xm
z_N*S(4<wrv_AQ`it~|PL-#(r^c|v)4`K-QIL|C<I6$cI+;L)Q;de~oqbTfjk2C4w{
zdf?*4i-unI@ZrOT0M*~$Pit!{EiEk!3=GT_!`grpvw`LSKSa`nQeR)6!F|`PS;O$~
z@av{wKTvF@02Lj9{X|5*6_F@y;MT2M(%IQ5V`F0y3WY>OBsDcvu3ft(E|*Ip3vgUS
zrbXl(5m_0zbu>~Jw}{A(ksxNOon4{1@5ICeRaI5w=H?n&!Gi}6;`Ms<MFT*!EJgwE
zYXp1u?wu8Y5)u-an3$O9s%HTEV&t`pNUU}e2m}m+TefVG8#ivqvSrKE`iMx4h?LrF
zw(w%z;gyj$cMJ{=a_rbKYHMrh@9&?vs{z0xOF=;8OCs$APz$^vOGSV!@(Sg#u9N8k
nJ_lCHQWo&0X`Ucj`uF-1>vsWI{F4jZ00000NkvXXu0mjft0&D>

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/Chat/reconnecting.png b/BookAStar/BookAStar/Images/Chat/reconnecting.png
new file mode 100644
index 0000000000000000000000000000000000000000..a30b22e99a1ccfaa7d251a8ae3cfb1216ed37f17
GIT binary patch
literal 4116
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
SfT#Wd0000<MNUMnLSTaS*9CI`

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index b0b45cb6..4b08b0f9 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -6,13 +6,20 @@ using XLabs.Platform.Services;
 
 namespace BookAStar.Pages
 {
-
+    using Data;
     public partial class BookQueriesPage : ContentPage
     {
         public BookQueriesPage()
         {
             InitializeComponent();
-            BindingContext = new BookQueriesViewModel();
+            var model = new BookQueriesViewModel();
+            model.RefreshQueries =
+                new Command( () => {
+                    DataManager.Current.BookQueries.Execute(null);
+                    this.list.EndRefresh();
+                });
+            
+            BindingContext = model;
         }
 
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
@@ -20,18 +27,5 @@ namespace BookAStar.Pages
             BookQueryData data = e.Item as BookQueryData;
             App.NavigationService.NavigateTo<BookQueryPage>(true,data);
         }
-        protected override void OnSizeAllocated(double width, double height)
-        {
-            /* TODO find a responsive layout
-            if (width > height)
-             {
-                 mainLayout.Orientation = StackOrientation.Horizontal;
-             }
-             else
-             {
-                 mainLayout.Orientation = StackOrientation.Vertical;
-             } */
-            base.OnSizeAllocated(width, height);
-        }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/ChatPage.xaml b/BookAStar/BookAStar/Pages/ChatPage.xaml
index adbb5844..0b3c6353 100644
--- a/BookAStar/BookAStar/Pages/ChatPage.xaml
+++ b/BookAStar/BookAStar/Pages/ChatPage.xaml
@@ -4,30 +4,74 @@
              x:Class="BookAStar.Pages.ChatPage"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
              xmlns:controls="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
-            xmlns:toolkit="clr-namespace:XLabs.Forms.Mvvm;assembly=XLabs.Forms"
+             xmlns:toolkit="clr-namespace:XLabs.Forms.Mvvm;assembly=XLabs.Forms"
+             xmlns:converters="clr-namespace:BookAStar.Converters;assembly=BookAStar"
+             xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
              >
+  
+    <!-- 
+  <TabbedPage.Resources>
+    <ResourceDictionary>
+  <converters:SignalRConnectionStateToObject x:Key="cxToStyleButton" x:TypeArguments="Style">
+
+        <converters:SignalRConnectionStateToObject.DisconnectedObject>
+          <Style TargetType="Button">
+            <Setter Property="Image"
+                    Value="{extensions:ImageResource BookAStar.Images.Chat.disconnected.png}" />
+          </Style>
+        </converters:SignalRConnectionStateToObject.DisconnectedObject>
+
+        <converters:SignalRConnectionStateToObject.ConnectedObject>
+          <Style TargetType="Button">
+            <Setter Property="Image"
+                    Value="{extensions:ImageResource BookAStar.Images.Chat.connected.png}" />
+          </Style>
+        </converters:SignalRConnectionStateToObject.ConnectedObject>
+    
+        <converters:SignalRConnectionStateToObject.ConnectingObject>
+          <Style TargetType="Button">
+            <Setter Property="Source"
+                    Value="{extensions:ImageResource BookAStar.Images.Chat.connecting.png}" />
+          </Style>
+        </converters:SignalRConnectionStateToObject.ConnectingObject>
+
+        <converters:SignalRConnectionStateToObject.ReconnectingObject>
+          <Style TargetType="Button">
+            <Setter Property="Source"
+                    Value="{extensions:ImageResource BookAStar.Images.Chat.reconnecting.png}" />
+          </Style>
+        </converters:SignalRConnectionStateToObject.ReconnectingObject>
+      </converters:SignalRConnectionStateToObject>
+    </ResourceDictionary>
+  </TabbedPage.Resources> -->
   <TabbedPage.Children>
     <ContentPage Title="Public" Icon="chat_icon_s.png" >
       <StackLayout Padding="5, 5, 5, 5">
         <StackLayout Spacing = "12"
                       Orientation = "Horizontal"
                       Padding="5, 0, 5, 0">
+          
+        <Button x:Name="reconnectButton" Clicked="ReconnectButton_Clicked"/>
+       <!--   Style="{Binding Source={x:Static local:App.CurrentApp.ChatHubConnection}, 
+                                Path=State, 
+                                Converter={StaticResource cxToStyleButton}}" -->
           <Entry x:Name="messageEntry" Placeholder = "enter your Message"
-                 VerticalOptions = "Center" 
+                 VerticalOptions = "Center"
                       HorizontalOptions = "FillAndExpand"></Entry>
           <Button x:Name="sendButton" Text = "Send" HorizontalOptions = "End"
                   VerticalOptions = "Center"></Button>
         </StackLayout>
-        <ListView x:Name="messageList" HasUnevenRows="true">
+        <ListView x:Name="messageList" HasUnevenRows="true"
+                  >
           <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
             <DataTemplate>
               <ViewCell>
                 <ViewCell.View>
                   <StackLayout Orientation="Horizontal" VerticalOptions="StartAndExpand">
-                      <Label Text="{Binding Date, StringFormat='{0:HH:mm}'}" FontAttributes="Italic" />
-                      <Label Text="{Binding SenderId}" FontFamily="monospace" FontAttributes="Italic" />
-                      <BoxView WidthRequest="1" HeightRequest="15" Color="#000090"/>
-                      <Label Text="{Binding Message}" FontFamily="monospace" />
+                    <Label Text="{Binding Date, StringFormat='{0:HH:mm}'}" FontAttributes="Italic" />
+                    <Label Text="{Binding SenderId}" FontFamily="monospace" FontAttributes="Italic" />
+                    <BoxView WidthRequest="1" HeightRequest="15" Color="#000090"/>
+                    <Label Text="{Binding Message}" FontFamily="monospace" />
                   </StackLayout>
                 </ViewCell.View>
               </ViewCell>
@@ -36,61 +80,62 @@
         </ListView>
       </StackLayout>
     </ContentPage>
-   <ContentPage Title="Notifications" Icon="exclam.png" >
-     <StackLayout Padding="5, 5, 5, 5">
-     <ListView x:Name="notifList" HasUnevenRows="true">
+    <ContentPage Title="Notifications" Icon="exclam.png" >
+      <StackLayout Padding="5, 5, 5, 5">
+        <ListView x:Name="notifList" HasUnevenRows="true">
           <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
             <DataTemplate>
               <ViewCell>
                 <ViewCell.View>
                   <StackLayout Orientation="Horizontal" VerticalOptions="StartAndExpand">
-                      <Label Text="{Binding Date, StringFormat='{0:hh:mm}'}" FontAttributes="Italic" />
-                      <Label Text="{Binding SenderId}" FontFamily="monospace" FontAttributes="Italic" />
-                      <BoxView Color="#000090" WidthRequest="1" HeightRequest="15" />
-                      <Label Text="{Binding Message}" FontFamily="monospace" />
+                    <Label Text="{Binding Date, StringFormat='{0:hh:mm}'}" FontAttributes="Italic" />
+                    <Label Text="{Binding SenderId}" FontFamily="monospace" FontAttributes="Italic" />
+                    <BoxView Color="#000090" WidthRequest="1" HeightRequest="15" />
+                    <Label Text="{Binding Message}" FontFamily="monospace" />
                   </StackLayout>
                 </ViewCell.View>
               </ViewCell>
             </DataTemplate>
           </ListView.ItemTemplate>
         </ListView>
-       </StackLayout>
+      </StackLayout>
     </ContentPage>
-  
+
     <ContentPage Title="Contacts" Icon="peer_to_peer.png" >
       <StackLayout Padding="5, 5, 5, 5">
-      <StackLayout Spacing = "12"
-                      Orientation = "Horizontal"
-                      Padding="5, 0, 5, 0">
+        <StackLayout Spacing = "12"
+                        Orientation = "Horizontal"
+                        Padding="5, 0, 5, 0">
           <Entry x:Name="pvEntry" Placeholder = "enter your private message"
                  VerticalOptions = "Center"
                       HorizontalOptions = "FillAndExpand"></Entry>
-         <!--
+          <!--
          <controls:ExtendedPicker x:Name="contactPicker" Display="{Binding UserName}"></controls:ExtendedPicker>
-        --> 
-<controls:ExtendedPicker x:Name="contactPicker" />
- <Button x:Name="sendPVButton" Text = "Send" HorizontalOptions = "End"
-                  VerticalOptions = "Center"></Button>
+        -->
+          <controls:ExtendedPicker x:Name="contactPicker" />
+          <Button x:Name="sendPVButton" Text = "Send" HorizontalOptions = "End"
+                           VerticalOptions = "Center"></Button>
         </StackLayout>
         <ListView x:Name="PVList" HasUnevenRows="true">
-          <ListView.ItemTemplate HeightRequest="80" VerticalOptions="StartAndExpand">
+          <ListView.ItemTemplate HeightRequest="80" 
+                                 VerticalOptions="StartAndExpand">
             <DataTemplate>
               <ViewCell>
                 <ViewCell.View>
                   <StackLayout Orientation="Horizontal" VerticalOptions="StartAndExpand">
-                      <Label Text="{Binding Date, StringFormat='{0:hh:mm}'}" FontAttributes="Italic" />
-                      <Label Text="{Binding SenderId}" FontFamily="monospace" FontAttributes="Italic" />
-                      <BoxView Color="#000090" WidthRequest="1" HeightRequest="15" />
-                      <Label Text="{Binding Message}" FontFamily="monospace" />
+                    <Label Text="{Binding Date, StringFormat='{0:hh:mm}'}" FontAttributes="Italic" />
+                    <Label Text="{Binding SenderId}" FontFamily="monospace" FontAttributes="Italic" />
+                    <BoxView Color="#000090" WidthRequest="1" HeightRequest="15" />
+                    <Label Text="{Binding Message}" FontFamily="monospace" />
                   </StackLayout>
                 </ViewCell.View>
               </ViewCell>
             </DataTemplate>
           </ListView.ItemTemplate>
         </ListView>
-       <!-- <views:UserListView ItemsSource="" /> -->
-    </StackLayout>
-    
-    </ContentPage> 
+        <!-- <views:UserListView ItemsSource="" /> -->
+      </StackLayout>
+
+    </ContentPage>
   </TabbedPage.Children>
 </TabbedPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
index 9ffc54d2..cb78f52f 100644
--- a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
@@ -29,6 +29,8 @@ namespace BookAStar.Pages
 
                 try
                 {
+                     ConnectionState cs = App.CurrentApp.ChatHubConnection.State;
+
                     await App.CurrentApp.ChatHubProxy.Invoke<string>("Send", ChatUser, messageEntry.Text);
                     messageEntry.Text = null;
                 }
@@ -39,13 +41,25 @@ namespace BookAStar.Pages
 
                 IsBusy = false;
             };
-            // contactPicker.DisplayProperty = "UserName";
-            
+
+            sendPVButton.Clicked += async (sender, args) =>
+            {
+                IsBusy = true;
+
+                try
+                {
+                    await App.CurrentApp.ChatHubProxy.Invoke<string>("SendPV", ChatUser, messageEntry.Text);
+                    messageEntry.Text = null;
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex);
+                }
+
+                IsBusy = false;
+            };
             messageList.ItemsSource = Messages = new ObservableCollection<ChatMessage>();
-            PVList.ItemsSource = DataManager.Current.PrivateMessages;
             App.CurrentApp.ChatHubConnection.StateChanged += ChatHubConnection_StateChanged;
-            // DataManager.Current.Contacts 
-
             MainSettings.UserChanged += MainSettings_UserChanged;
             MainSettings_UserChanged(this, null);
 
@@ -70,15 +84,26 @@ namespace BookAStar.Pages
             });
         }
 
+        private void ReconnectButton_Clicked(object sender, EventArgs e)
+        {
+            App.CurrentApp.ChatHubConnection.Stop();
+            App.CurrentApp.ChatHubConnection.Start();
+        }
+
         private void MainSettings_UserChanged(object sender, EventArgs e)
         {
             ChatUser = MainSettings.UserName;
             contactPicker.ItemsSource = DataManager.Current.Contacts;
+            PVList.ItemsSource = DataManager.Current.PrivateMessages;
         }
 
         private void ChatHubConnection_StateChanged(StateChange obj)
         {
-            sendButton.IsEnabled = obj.NewState == ConnectionState.Connected;
+            Xamarin.Forms.Device.BeginInvokeOnMainThread(
+                () => {
+                    sendButton.IsEnabled = obj.NewState == ConnectionState.Connected;
+                    reconnectButton.IsEnabled = obj.NewState != ConnectionState.Connected;
+                });
         }
     }
 }
diff --git a/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs b/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
index a80cf127..76becbeb 100644
--- a/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
@@ -22,7 +22,7 @@ namespace BookAStar.ViewModels
 
         public ICommand RefreshQueries
         {
-            get { return DataManager.Current.BookQueries; }
+            get; set;
         }
     }
 }

From 990e7a8a23770e9a19e2403356d0e8b98dcd07b9 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 29 Oct 2016 02:49:45 +0200
Subject: [PATCH 3/5] meilleur choix de code

---
 BookAStar/BookAStar/App.xaml.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index beabc53f..e7c2fd10 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -29,8 +29,7 @@ namespace BookAStar
         public static string AppName { get; set; }
 
 
-        // Exists in order to dispose of a static instance strongly typed,
-        // It Makes smaller code.
+        [Obsolete("Instead using this, use new static properties.")]
         public static App CurrentApp { get { return Current as App; } }
        
         public static bool MasterPresented
@@ -253,8 +252,8 @@ namespace BookAStar
                 }
             }
         }
-        private HubConnection chatHubConnection = null;
-        public HubConnection ChatHubConnection
+        private static HubConnection chatHubConnection = null;
+        public static HubConnection ChatHubConnection
         {
             get
             {

From 072f16fc0a4922aab660e42c5ebc9481d6a6d3e7 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 29 Oct 2016 02:50:24 +0200
Subject: [PATCH 4/5] =?UTF-8?q?corrige=20l'absence=20des=20icones=20r?=
 =?UTF-8?q?=C3=A9seau?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BookAStar/BookAStar/BookAStar.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index 8dba105c..8e1b2254 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -378,10 +378,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Images\Chat\connected.png" />
-    <Content Include="Images\Chat\connecting.png" />
-    <Content Include="Images\Chat\disconnected.png" />
-    <Content Include="Images\Chat\reconnecting.png" />
+    <EmbeddedResource Include="Images\Chat\connected.png" />
+    <EmbeddedResource Include="Images\Chat\connecting.png" />
+    <EmbeddedResource Include="Images\Chat\disconnected.png" />
+    <EmbeddedResource Include="Images\Chat\reconnecting.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />

From c114b851d2507e1f4ca66d2d9aea44489db3ef66 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sat, 29 Oct 2016 02:51:19 +0200
Subject: [PATCH 5/5] =?UTF-8?q?affiche=20l'=C3=A9tat=20de=20la=20connexion?=
 =?UTF-8?q?=20SignalR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BookAStar/BookAStar/Pages/ChatPage.xaml    | 41 +++++++++++-----------
 BookAStar/BookAStar/Pages/ChatPage.xaml.cs | 14 ++++----
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/BookAStar/BookAStar/Pages/ChatPage.xaml b/BookAStar/BookAStar/Pages/ChatPage.xaml
index 0b3c6353..a04a76bf 100644
--- a/BookAStar/BookAStar/Pages/ChatPage.xaml
+++ b/BookAStar/BookAStar/Pages/ChatPage.xaml
@@ -1,60 +1,61 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.Pages.ChatPage"
-             xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             xmlns:controls="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
-             xmlns:toolkit="clr-namespace:XLabs.Forms.Mvvm;assembly=XLabs.Forms"
-             xmlns:converters="clr-namespace:BookAStar.Converters;assembly=BookAStar"
-             xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            x:Class="BookAStar.Pages.ChatPage"
+            xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
+            xmlns:controls="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
+            xmlns:toolkit="clr-namespace:XLabs.Forms.Mvvm;assembly=XLabs.Forms"
+            xmlns:converters="clr-namespace:BookAStar.Converters;assembly=BookAStar"
+            xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
+            xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar"
              >
   
-    <!-- 
+   
   <TabbedPage.Resources>
     <ResourceDictionary>
-  <converters:SignalRConnectionStateToObject x:Key="cxToStyleButton" x:TypeArguments="Style">
+  <converters:SignalRConnectionStateToObject x:Key="cxToStyleImage" x:TypeArguments="Style">
 
         <converters:SignalRConnectionStateToObject.DisconnectedObject>
-          <Style TargetType="Button">
-            <Setter Property="Image"
+          <Style TargetType="Image">
+            <Setter Property="Source"
                     Value="{extensions:ImageResource BookAStar.Images.Chat.disconnected.png}" />
           </Style>
         </converters:SignalRConnectionStateToObject.DisconnectedObject>
 
         <converters:SignalRConnectionStateToObject.ConnectedObject>
-          <Style TargetType="Button">
-            <Setter Property="Image"
+          <Style TargetType="Image">
+            <Setter Property="Source"
                     Value="{extensions:ImageResource BookAStar.Images.Chat.connected.png}" />
           </Style>
         </converters:SignalRConnectionStateToObject.ConnectedObject>
     
         <converters:SignalRConnectionStateToObject.ConnectingObject>
-          <Style TargetType="Button">
+          <Style TargetType="Image">
             <Setter Property="Source"
                     Value="{extensions:ImageResource BookAStar.Images.Chat.connecting.png}" />
           </Style>
         </converters:SignalRConnectionStateToObject.ConnectingObject>
 
         <converters:SignalRConnectionStateToObject.ReconnectingObject>
-          <Style TargetType="Button">
+          <Style TargetType="Image">
             <Setter Property="Source"
                     Value="{extensions:ImageResource BookAStar.Images.Chat.reconnecting.png}" />
           </Style>
         </converters:SignalRConnectionStateToObject.ReconnectingObject>
       </converters:SignalRConnectionStateToObject>
     </ResourceDictionary>
-  </TabbedPage.Resources> -->
+  </TabbedPage.Resources> 
   <TabbedPage.Children>
     <ContentPage Title="Public" Icon="chat_icon_s.png" >
       <StackLayout Padding="5, 5, 5, 5">
         <StackLayout Spacing = "12"
                       Orientation = "Horizontal"
                       Padding="5, 0, 5, 0">
-          
-        <Button x:Name="reconnectButton" Clicked="ReconnectButton_Clicked"/>
-       <!--   Style="{Binding Source={x:Static local:App.CurrentApp.ChatHubConnection}, 
+          <Image 
+       x:Name="reconnectImage" 
+        Style="{Binding Source={x:Static local:App.ChatHubConnection}, 
                                 Path=State, 
-                                Converter={StaticResource cxToStyleButton}}" -->
+                                Converter={StaticResource cxToStyleImage}}" />
           <Entry x:Name="messageEntry" Placeholder = "enter your Message"
                  VerticalOptions = "Center"
                       HorizontalOptions = "FillAndExpand"></Entry>
diff --git a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
index cb78f52f..ca5ade7b 100644
--- a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
@@ -29,7 +29,7 @@ namespace BookAStar.Pages
 
                 try
                 {
-                     ConnectionState cs = App.CurrentApp.ChatHubConnection.State;
+                     ConnectionState cs = App.ChatHubConnection.State;
 
                     await App.CurrentApp.ChatHubProxy.Invoke<string>("Send", ChatUser, messageEntry.Text);
                     messageEntry.Text = null;
@@ -48,8 +48,8 @@ namespace BookAStar.Pages
 
                 try
                 {
-                    await App.CurrentApp.ChatHubProxy.Invoke<string>("SendPV", ChatUser, messageEntry.Text);
-                    messageEntry.Text = null;
+                    await App.CurrentApp.ChatHubProxy.Invoke<string>("SendPV", ChatUser, pvEntry.Text);
+                    pvEntry.Text = null;
                 }
                 catch (Exception ex)
                 {
@@ -59,7 +59,8 @@ namespace BookAStar.Pages
                 IsBusy = false;
             };
             messageList.ItemsSource = Messages = new ObservableCollection<ChatMessage>();
-            App.CurrentApp.ChatHubConnection.StateChanged += ChatHubConnection_StateChanged;
+            notifList.ItemsSource = Notifs = new ObservableCollection<ChatMessage>();
+            App.ChatHubConnection.StateChanged += ChatHubConnection_StateChanged;
             MainSettings.UserChanged += MainSettings_UserChanged;
             MainSettings_UserChanged(this, null);
 
@@ -86,8 +87,8 @@ namespace BookAStar.Pages
 
         private void ReconnectButton_Clicked(object sender, EventArgs e)
         {
-            App.CurrentApp.ChatHubConnection.Stop();
-            App.CurrentApp.ChatHubConnection.Start();
+            App.ChatHubConnection.Stop();
+            App.ChatHubConnection.Start();
         }
 
         private void MainSettings_UserChanged(object sender, EventArgs e)
@@ -102,7 +103,6 @@ namespace BookAStar.Pages
             Xamarin.Forms.Device.BeginInvokeOnMainThread(
                 () => {
                     sendButton.IsEnabled = obj.NewState == ConnectionState.Connected;
-                    reconnectButton.IsEnabled = obj.NewState != ConnectionState.Connected;
                 });
         }
     }