From cdc3597786dcb6c3bb69a5041edba9e7ba8e0858 Mon Sep 17 00:00:00 2001
From: chaignea <mathis.chaigneau@etu.u-pec.fr>
Date: Sat, 8 Apr 2023 13:42:19 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20bug=20>=20Choix=20d'un=20mot=20de?=
 =?UTF-8?q?=20passe=20avec=20une=20pi=C3=A8ce=20vide=20alors=20que=20que?=
 =?UTF-8?q?=20non=20autoris=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../7.5/executionHistory/executionHistory.bin | Bin 975205 -> 975205 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/7.5/fileHashes/fileHashes.bin         | Bin 72665 -> 72665 bytes
 .gradle/7.5/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../7.5/fileHashes/resourceHashesCache.bin    | Bin 19789 -> 19857 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../example/mastermind/ChoixDuMotDePasse.java |  18 ++++++++++++------
 .../mastermind/MonOnTouchListener.java        |   4 +---
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin
index 9272a048fc26a239cbdf8a316b519ccca0724289..f440dbbb6a70debb606136f293d57240eb884acc 100644
GIT binary patch
delta 1545
zcmah}Yfw{16wbX#l-DjdAwmeoP^AchF%W{U)?yJ_tPn=Wu@aGhKph1Ip%z~e=*0@8
z6p*@tBI>9q;G?v5)(4`*NKt4l;0qn_i2_9wgs33Un>f=S@rV0s_w1Q(&wl6oPKSPO
zhkkB4P0%FGra3g19!HO-t!Qi7hPI{cP66?h$uWL@aS8D;sT<bC#jc4?*&H98ESLLj
zR-`4f%!}uRKbr!axct+V*PgLdf`y05ss-_bDMQ3@bWjeQaDEyTaPTf~kU{ce4m+eS
zEmu4?K9x9BZw)w07?6(?$dN1&K%A?AK?FV~1CK~*@%3Qk>iRW$b>2_51EPKBQ0->m
zjJCx?h`Tdk4vEA4!7VQDT3*q>qy5Q^hZkj))!2qa-bQ_Y+RegAp8yw9u3Os_+tO_l
zy2o?%iM4J~vfiT=Sw<QCvWv}TQ9-W_F5)NJGXV>8*B$FpdUFUC%cT;{-vwkSsS#MC
zsB*9ZFFXoYbMU!9(0k;AL=awRz7}{PX&M8uPYb*;v$G@d${sMCpp-ESCMy3Jv%zk`
zlac<}Y~&LMopJsapd+yAIk-$x9fqGHGMe|?2x>|>w7p3(0n7S<giVER8rgPZ7%#5b
zSXFxd(vA@nodJ6AS4NOT^4zk&CQlVcKGvL6N?oK^zw1L8&#h*n^gu8d&wB%^NTFp@
zw6uu>g9A!R0j_xJTfiZ_ESqA?H0RhcED`tT$p=Et9y--}jcxtb$qH3w0}rGb0aEHg
z<dxT-?rrob^$l%zD~%sTyc{4xH%CB((6V_2=0}U{QE3ivN9#s`Ev5b@2G!EO$}(4O
z%cbrYAt-wk6!?Ec&Cz)9GuQjy3tZoykhzMf;E1-Qc4cviCVR*A@EW$Dg9!<XD3ASf
z*!FwxizYb+Di-1JF;GZQmRdmBxnKuQBj6;$?L#7F`?IPMk8SOW?~u^ST4E_3Lc1y<
zIwd78MH(BIM*RJb<{2b(;=Ly%thR%y@tpeO6<O$l1Jnv~Z8II8p7a*K-R@VeTcVD5
z`U`UtC4gI}RE)K&78t@C2PgXQlW7*8`CG8x!54)Mim=cw#gNm9yG>|R0Aod}hrPb)
z?pHOh{)z_0oJ&=D2HYs?s&63CgD`6$s&s&qi|Iw9Y=C4?v`w9go+bG`cbYp1@%OcR
z@P!F*Y3c`A80W_N9UaJnV)Qx(y6d*&z%TfV`aN&zjLHWsO-N(^xZyZ);+?D0)v%7h
zYg(X)<X`l4FjhrygQNTABphoCDkU!e?`kbxdK2~%e8c&9pG#KEsM{2&_#qGs0iwbL
z^D)kihmHi!Z-uP{Z)9hVqU83MI=xUWm3jQz*<hmC6NhgAR)o;fKRd_DncudVg&fK~
zVmcxBwJ;2=YJ+)RmR|bJoPEb6>4?g$fo(Tz+`<R1ORA@D8Hb`$!88=y4k_+cGm5Gm
zI`ij0s&y>L*Y*W$I_+ftGHfqVjFNqT19BYzToH?s+fP07tN4m5<vl@kE410rXU0D`
z5e=s@3U6<Ru0l)S(&?u5)Y_xv-vT-HWM;baladzqvj^%kk2WMuLd);LSWYnmgKF==
z=^;M5RYSwir9XyD+g*5<T9(KZ9-z5c`Os5YP~thr>1%BsW<p{AEXc?yYs=EP*Yzci
r_A8l?<w(FG8-YC`Av>X$_|2@S^4ZH<iaP6DTFuqy>j=}_Tc-LCC9RIM

delta 1406
zcmah}X;f237|nYm0>X?hAZ06pVo@N3U=VFnM8pFJC>rWkMAksWl(vRVib6pjC?Oy=
z;0To-QPCFgSQMRBK?GSs;k1Gat`G~Ts7C}%8l_?%_8<Mh{F-xT=FWHT+;4_kM8hqj
zY?`1++JI)$9C{XQNE^|{^laLMHmwJCjtis-LQlCcS)P<3m1iWz$r2@!CDIsaM&ehj
z_rv5O_HhK39K1Chdb6>L2XaWfJPRHoaIF9glGMuD)cLU2|3Xu6gzWg~HJ+$B16ZR>
zDTMgRZm1x!*bDS=xFZL|_x|Dq?q_Y(w+)o`G~PmE9j43i_D_K=DSV?%P%Exyj@XOU
zH@(KXpFUOA(>lSv@eu<97Bx}%+2Y<R?yXbaS7V1ckDJ*9i)CAbd{sbzws!+#6!kOM
zf`d-L1UA0t2cB2WsEM@;`6_`c;-@ndhn0YbnVBhxBcA~`f;z2`NK}DGTOxw>Vo#G5
z3gi(Ft#R>AaFW2`qo9qXJO`*MVVWvCeZiPJo8>3Mf^lGPKn01@>Q;56eZE**B(k!5
z?Sf)*z%v}I1KUaNq|#sA>1`cQQ#oPXm|eDX4CRa(EkoIUK!jJk26d$6k`S*~My;3^
ztI=2OaMRD9)aVDa0u5^32MUquA8^Q(dRZP)SgKg+bN$l7bx9^6d8NG?tw3$cc%;>_
z99zA{U-Ro%|9*5ls0`KQgT*N8E#Olf>kC~@S)_%leLYs$iPq;Lt^(Mgn{UBptLaZy
zr9I2o-U?8K0yv?sCxHotCMvu&3yOrDjiJ7w*-nd4{v<fy#fu&~QxdhwBQ&b%pxHrk
zh^b(i_TJ#grGSU#`MJBBx7OTcpx`IT32t>qQp??~qIyM6IavG-d{0o*lYsIIKpsvf
z;5=gCOlc&_Sq+G5VC;bJkkH83etK{Sr6e&XIXOO=9~Yla{PCa3?j*G2{x3#2+7yNx
zvX2zk)2PWDD(7DNNk_GB=HSMzQLp{hgNAPknU$!yaF=7AOIU2=mBeFj<+%-x$1{11
zwnshNBF4>L$bYO*uP*mdmZHhIFwW-u(6VSYay2m%9gY<%9Rhw}$aR9d9bF`Pu*TR5
z)tE!dcIrl*;1$WR<dx*QI{rCN`f%-u(1gLPVccW^H>Awy0=buU79A;qc1W*)PA7LN
zU;y3}4Mzzqy9RAYR4Rczc*9NjoG{a@EPH$=cuRMg-O?*1?V%fqYE&r%AK?Ni{D8p4
zx8ZGqYrZ2%^Q+m5>i(D<`oU;!M%R>W&RCoTj0n^qgA_+I&IAMX$lx&~xetrb)h`(x
z`YBM*0H$;_{XMJeTI8dnT@;^><K!qR1-Kype&%SKiU}zS?}yfAqt16(PurvgE^~@x
zeew5nL>ZEM0CVK<3UF*#lyJ_X-+r;{bf9<^Hhm$zttBs~_$xm|6Ddp@`}?7T)$|TK
z{(egrKw+ssNZF<;x-Zv#T(a?9`gbpaB3n?{0E}ZlXUas)1JEt-o3+9B&*iSuZd-Rw
z)||Mnf+_q$TgPQdrqJR1kk5RN$2*)E=!<T@y6oCLd;0ElIE&PVl?*h!d2wJGm_yj7
gBt;h7P_=zKyKv%@#_F8CH{Mrsrk$Ajp*Ds83*_-#H2?qr

diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock
index b3f8bd65bcc06ffd0bbd2fc219c8577f869e65a6..c3b77265f9c6d85244109de05cafad6c42791383 100644
GIT binary patch
literal 17
UcmZQxXdCxzS@nKj1_)>Y05*99*8l(j

literal 17
UcmZQxXdCxzS@nKj1_&qv05)p`$p8QV

diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin
index bd2886b039e2535927425857b2902d41a0f069bd..a5d9614bc68ed4a64f2aa36281ee3461166e623e 100644
GIT binary patch
delta 579
zcmcb)o#p0smJJ)1D12QoZHZ@uq9dPqRd(c+J=Yi*7~2z8Woj^h0Y~ZNi%ZHB9?EJY
zq}n~6?<JL7x~ekz0926~L=m&X<iHuildG0aRe0DOvRQG{r2-?v?A`XEvrEAW`$85%
z6moS>)?ao@!9U4G#((R7uI(yrO4AR$wS<^f-vLp?d3W-}R^iDu%Y|7IR@E<^9K75|
z;pvg7QH_^oTy?!zyr}-7yeL%1CWsEUsLA`6tASLXn*4IPKJ%*jkCUZW_$c^R{;j?G
zdwbBnvW;{19&Y;!(bd2L(Zzmna{G!%+g0^5A$-<iAgyN%Bs76o5rhSpUhrwl{<Mf+
zX&HHW%8O&tP!l47l0cB`H2L5(;mHOoe=6))ef}*&w20TD`Fljtz83$2C~V?^DC9gc
z*>hEyLedi9lF*f=Prf~u7v59junVH7u?(V!&1LfaRVx&NuDJPUoX9$q(AUrXMQYA&
zs7ZnlMeI{HFJB#(t*|`%V#?)LT)s0jGuCCR#2Y|VP0j<Ws;X?6{4qv&x`jBS8}q7Z
zC#E-wGfF9Rb2o`SU#}zkr`}}c^5BFhh?Xho5Q7<ZPHrq0o_<c8F<Bw{(L1ArSKs%2
cKby!qljZP6h{|b)z$$~DWNr_XVC-N90ArBP<NyEw

delta 576
zcmcb)o#p0smJJ)1D2S|4pO)O4FMO$d)!`Us6<G!b#`fsnQ&SkgfW2<=#U*75J+BN?
z5)PNFt6iP@z4ge?<xoX?Ac~k>CI`+Co?NwbszjOy%O1v$y4?kj9)}cZ)n|beCiHx?
zobE5qC^gw}*$IX9UCGIlJr^B{_5KlH!fn?DQSmbYViae=<cY1qlWmp@vqb;XT0c2>
zxsQU$eSxLMWs@5!ls@XSFgRO7byPrfu<e<=f4Le<j7aCv$uF1dGxz+QGFf_skAhb~
z*+!@1WkDKW`>Z8oe`-N>ErIGfJ-K~Fq;1d7JP4n)7)a|G0|`waRs>;zlA^fotCNpb
za`pbU+PkW;9csc=pd=6^8%;hqO?a}w%AX2GzGh!Ij%?RSdhlaux$Y03ZeS4pGpK_o
z<V=|CxvES-;PWis-l<)t_E+|)1Q&7pf)vGwbhSYgv3X3sziNeo!<te>zDsVq_It->
zEm`kp0<rSfQmCRMo0qSS%U1aHHRD9rmD-o`0Vl4ReLV9Ttg4qS8?36Tl4J767~$y_
z;*4(0y&MYD8-XFOaCyZyfn!mu+xMP+Z`LpQm>sI+7sOzOos%2Og{PkrXG~Vu_QX7a
gWx6)EkoBCTfF1>Rh)ND=u*#svx3>pMFm^Bl0ETkPu>b%7

diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock
index 38d56ea78e9de0f9f41d8d29635ac64281f089c3..81566d439ba4f4968823e2397b8ac6610c56cb39 100644
GIT binary patch
literal 17
VcmZQBSfRUsf03Rh0~jzn0RSf912zBv

literal 17
VcmZQBSfRUsf03Rh0~j!C0RSe+10DbX

diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin
index 52008dfe9b4c169467071983cd8da43c6e416033..cbdff21de2ca7074eeefa3a39238efbc87a6da15 100644
GIT binary patch
delta 161
zcmX>*i*e#?#tkMCni>t)HhA>2U0Tin242ViLqU@oXVX)Yd?SdsukU78i5pA;DNADK
z*H`wlKt=N>i%Rciytq;EhxkSV50TA|9z3ir#z09)AQl8+0iREr*Oq_te|Y)g^g8}0
er`G}n<xo`|FcSW@F^bhK@uOAFn!B!ZK`H=1u{A9K

delta 51
zcmbO@oAK-{#tkMCf@%%dHhA>2U0Tin242TE$4cB_n(QmRnQ`Gp#UJ7u4Jt%7J9_Z2
F0s!ay5+eWr

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index b6c7fbc404a0bdc692f2e6378ca4df2722ef1692..552cbf039a541a8b59f54d68af25fe75874b1c2f 100644
GIT binary patch
literal 17
VcmZP$F`c)6-~Z@+3}C={6aYEq1&#m!

literal 17
VcmZP$F`c)6-~Z@+3}C>y9RNAl1%Lnm

diff --git a/app/src/main/java/com/example/mastermind/ChoixDuMotDePasse.java b/app/src/main/java/com/example/mastermind/ChoixDuMotDePasse.java
index ff86cdb..8e9f1b6 100644
--- a/app/src/main/java/com/example/mastermind/ChoixDuMotDePasse.java
+++ b/app/src/main/java/com/example/mastermind/ChoixDuMotDePasse.java
@@ -15,28 +15,34 @@ import java.util.Random;
 public class ChoixDuMotDePasse extends AppCompatActivity {
 
     private UnePiece un, deux, trois, quatre;
+    
+    private boolean vide;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_choix_du_mot_de_passe);
+        
+        this.vide = this.getIntent().getBooleanExtra("vide", false);
 
         this.un=(UnePiece) this.findViewById(R.id.code1);
         this.deux=(UnePiece) this.findViewById(R.id.code2);
         this.trois=(UnePiece) this.findViewById(R.id.code3);
         this.quatre=(UnePiece) this.findViewById(R.id.code4);
-
-        boolean t=this.getIntent().getBooleanExtra("vide", false);
-        this.un.setOnTouchListener(new MonOnTouchListener(this.un, t));
-        this.deux.setOnTouchListener(new MonOnTouchListener(this.deux, t));
-        this.trois.setOnTouchListener(new MonOnTouchListener(this.trois, t));
-        this.quatre.setOnTouchListener(new MonOnTouchListener(this.quatre, t));
+        
+        this.un.setOnTouchListener(new MonOnTouchListener(this.un, this.vide));
+        this.deux.setOnTouchListener(new MonOnTouchListener(this.deux, this.vide));
+        this.trois.setOnTouchListener(new MonOnTouchListener(this.trois, this.vide));
+        this.quatre.setOnTouchListener(new MonOnTouchListener(this.quatre, this.vide));
 
         this.findViewById(R.id.bouton_valider_code).setOnTouchListener(new OnTouchBoutonValider(this));
 
     }
 
     public void start(){
+        if(!this.vide && (this.un.getColor()==6 || this.deux.getColor()==6 || this.trois.getColor()==6 || this.quatre.getColor()==6)){
+            return;
+        }
         Intent mastermind=new Intent(this, MasterMindActivity.class);
         Intent data=this.getIntent();
         mastermind.putExtra("vide", data.getBooleanExtra("vide", false));
diff --git a/app/src/main/java/com/example/mastermind/controller/mastermind/MonOnTouchListener.java b/app/src/main/java/com/example/mastermind/controller/mastermind/MonOnTouchListener.java
index 2347695..17f3d37 100644
--- a/app/src/main/java/com/example/mastermind/controller/mastermind/MonOnTouchListener.java
+++ b/app/src/main/java/com/example/mastermind/controller/mastermind/MonOnTouchListener.java
@@ -14,9 +14,7 @@ public class MonOnTouchListener implements View.OnTouchListener {
     public MonOnTouchListener(UnePiece p, boolean t){
         this.detector=new GestureDetector(new MonGestureListener(p));
         this.detector.setOnDoubleTapListener(new MonOnDoubleTapListener(p));
-        if(t==false){
-            this.detector.setIsLongpressEnabled(t);
-        }
+        this.detector.setIsLongpressEnabled(t);
     }
 
     @Override