From a427c1bf0eafe628e641ef0e3cc4d3dfac0a4bf4 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Sun, 10 Nov 2013 10:10:37 +0100
Subject: [PATCH] Fixed incorrect layout and NullPointerException in message
 replys

---
 .../bin/android-pulltorefresh.jar             | Bin 76434 -> 76434 bytes
 .../ugr/swad/swadroid/modules/Messages.java   |  22 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Android-PullToRefresh/bin/android-pulltorefresh.jar b/Android-PullToRefresh/bin/android-pulltorefresh.jar
index cb0878215edcda03313d47d4652bdcb3c47505c4..1acc0fff50f0fdf2ab4c72067abeaee647692593 100644
GIT binary patch
delta 939
zcmXw%T}V@57{`6KQ=L<rHrw2Ee$20JseuHeW=S;z6O#mkZU$vhnQ74~DRXLCjIqLx
zQ=X`3$hu27*<0>n^aXVhg<Y7CRNmyZMi+@F(fd5_y86A(*Z=uAXLME?ot4bZjYi3u
zA<J^ck%R3c=6b{G9qqdUzR6e({C~4G_-o(>Taz*+q)GWAV=!m{pL(p%to7u8jrp_v
zR_;}GZ#_%7e`7h*y$V*64=S_hedDW7b2-4xI=8K$oZ7lXj%=oHm)2p`iyci=E%_&i
z&uT(M_wI;Lt!+W74Kt!p8+L+)1^4umepV#FT!Ag9q$*PZ)fHIJ!u8cOx!(Ax8asr0
zCTOF|zT-x;hX#5no)w9a#&kTu=A#CTsg^`QosY__>h^xh35|3U7w;aWX%9UJlRX{Z
zM_QJ|y-d`6G8rVlGF3;j@HO#RY&f-(dZcZ2I3+Xdt3R}v>CHIR=<jMbpvL0I0nDXK
zkGY|QeV7)5Hq7{`IX@;9rsiTBvEaaheG{^EX(gL8$v;sqDkb?xy+TsaOlV3bOt64;
zNp5x1G`iQP{+d&?jtbbEY_Y(y!N~szt;q^?JWm_7!U^PZnn4?!M*F=DP9m#v-~uw9
z18qpfE_gA`A9lEm{=*J9i+t;Veq>!P@6Y)<mygHk&x5PT=Xr1wxyuP5r0#@k$f|tk
zK;F-XQ%FMr3?bD5P?6q3xP*LEDDs^}(1-TJB4|g-F3^zUF6ct$7K^;GVv%Pr5qX0p
zFi82OqF-03nEPj%&1DeA_~$Y>gRCis>&Tbo;tthrG52G)*xTuW^BBM7fllPAN9eVA
VMgBLhxbNPra1P^7({xop=pRVde}w=5

delta 939
zcmXw%T}V@57{`6)sm`gX&8BnCkNGv1E*Qb6t)!ZPiAaK7PRgRv(xO#T=G3$p!@`f3
zJW-K|-6fptEq5{cg1U%eU6_zm-sH7L7l|a%`#kTu`n}KB|M@s)Y+f0gS2CI!(iLl(
zs;X%%tbH`2&eX#6ZyNY!h63>a&DY_tNf>-x$yAVL?X!x(kO_S3SYL+TlM6ZApY68_
zFEiYAJmLC<<=k*<SV=yp&Z75?FFxIw2QJ>ZV-4k4>k2utxv^8(fK|_THBz<WpC&#H
zgo&=bQK?$fjAZq5vQQs!fQ5(l^^<;9G{~L7ZK%Yw*&uTUH}XiGmnJtFK6<f3q-UBo
zs_r|Uj`r|CFU7N>L!^<M2=c|431iGM6=aJsm3wX<q@3_*H*xvSQJVJf{Rr8~i36l%
znYx>anvZ8f<kx0vX%?|29*d78c2kd(%|;R`x4!&Mo0(rvQjPJpW)o^Ge;B}Ay7agU
zO8NVw9JGGUPtC<KsW7oHv>6KyE!nmpTUXYy1>@oq^`cT-eAFu>70ZOi_>>uzur4mF
zZkon$``FI~P4B3Jt?_0HteVorAE7r|p;qMSV^%nUTum{Q1E<k`mjfq}o?N(qoXCYX
zq-K-6nBsRETt@$qJUEMdlL!6CTD#~k_{uKE6ZGf9RphgLxQX23fH2Z<z%`_&06LKO
z3g8sdR0zXJRtOB~E`m$Qhea~qQ4D=(KPZMXNYx2Ca?%N1NPCIQ8!wT0wo;ilSPFxb
zUncu?mC3n(q}Wsr5sZH-hjwJ30<I%pRLDDcU2^V6F1fd(63%1%RwZ;I|5Qr7Hn+_G
T>X!H2za7qD{7H(=DhU4r`ujwE

diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java
index 38a69fa4..82c34e92 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java
@@ -130,8 +130,18 @@ public class Messages extends Module {
     private final OnShowListener showListener = new DialogInterface.OnShowListener() {
         @Override
         public void onShow(DialogInterface dialog) {
+            EditText receiversText = (EditText) messageDialog.findViewById(R.id.message_receivers_text);;
+            EditText subjectText = (EditText) messageDialog.findViewById(R.id.message_subject_text);;
             Button b = ((AlertDialog) messageDialog).getButton(AlertDialog.BUTTON_POSITIVE);
+            
             b.setOnClickListener(positiveClickListener);
+            
+            if (notificationCode != 0) {
+                subject = getIntent().getStringExtra("summary");
+
+                subjectText.setText("Re: " + subject);
+                receiversText.setVisibility(View.GONE);
+            }
         }
     };
 
@@ -149,8 +159,6 @@ public class Messages extends Module {
      */
     @Override
     protected void onStart() {
-        EditText receiversText, subjectText;
-
         super.onStart();
 
         notificationCode = getIntent().getLongExtra("notificationCode", 0);
@@ -165,16 +173,6 @@ public class Messages extends Module {
         		null,
         		negativeClickListener,
         		cancelClickListener);
-        
-        if (notificationCode != 0) {
-            subject = getIntent().getStringExtra("summary");
-
-            receiversText = (EditText) messageDialog.findViewById(R.id.message_receivers_text);
-            subjectText = (EditText) messageDialog.findViewById(R.id.message_subject_text);
-
-            subjectText.setText("Re: " + subject);
-            receiversText.setVisibility(View.GONE);
-        }
 
         messageDialog.setOnShowListener(showListener);
         messageDialog.show();