From 2d21e2ae2cf109760b71135093e3e92fe8cf715e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 8 Nov 2017 12:56:55 -0500 Subject: [PATCH] Fix build warnings from XCode 9. --- Signal.xcodeproj/project.pbxproj | 14 +++++++++++++- .../xcshareddata/xcschemes/Signal.xcscheme | 4 +++- .../AppIcon.appiconset/Contents.json | 6 ++++++ .../AppIcon.appiconset/iTunesArtwork@3x.png | Bin 0 -> 14942 bytes .../Cells/OWSSystemMessageCell.m | 5 ----- .../ConversationViewController.m | 2 +- Signal/src/ViewControllers/InboxTableViewCell.m | 3 ++- Signal/src/views/ContactTableViewCell.m | 2 ++ .../src/Messages/Interactions/TSInteraction.h | 2 -- .../src/Messages/OWSMessageSender.m | 7 ++++--- .../Requests/TSProfileAvatarUploadFormRequest.h | 2 -- SignalServiceKit/src/Util/NSDate+OWS.h | 2 -- 12 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 Signal/Images.xcassets/AppIcon.appiconset/iTunesArtwork@3x.png diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 9729e1d19..9ac095887 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -1844,7 +1844,7 @@ attributes = { LastSwiftUpdateCheck = 0720; LastTestingUpgradeCheck = 0600; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0910; ORGANIZATIONNAME = "Open Whisper Systems"; TargetAttributes = { D221A088169C9E5E00537ABF = { @@ -2542,6 +2542,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2550,6 +2552,8 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -2731,6 +2735,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2739,6 +2745,8 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; @@ -2796,6 +2804,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -2804,6 +2814,8 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_RECEIVER_WEAK = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 19321cc59..9eb66f2b5 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -1,6 +1,6 @@ @pi9W!HR<~N`3_mAiGJbyg@KCkEeG3UD8@B6;)_kHF*Gv{2_IpHQodK|2RtN;KG z1AT2%08n%j1(=caoqp435q&4%rE|l}%-zw;=k_B9aM9lVjswQP^|q6Psl#piClA{k z)Br#N6T@pdnCL|kiS)3V7&kyR`MPS7v*K1qjQB;4ZYTK>h`B@Lj3IJPKRNjOdg%A{ zq(QQ3>hg`e)vz{FY7gmoC+TZH8EzmtRuM~v$<7sPaowc!9@4#vHHY%GiTO>|&sn*g zvl9249Qlj=dWfBk?)kRJ#Jcm`D6V<4=J#D z-L7~wk}kWJc)yD1Rlu?oA*%R}p;(#Ds3r z)8_T$L2_yzIqb*!wY=4YUUKwrvSZ1rZ}Yl!(W+Ms(e(3*UHKZ^O1eXj-?IL$m;9!K z6xcw_86w{*UQHV!*G*EAMkvW6l&T3z%>*TFl#)40`8Gi*pP;-Sq0~-N2$PihNlNKB zU&bh9^s>Ey=!Hnp-B7O;Fs+RzCh*%NnET ze^@>lw^Te%>6ls{np;;%UW#v7I}x|^w0aerxuW=f$-Qz-J#ASoap_LMigN05Q6Ew7 zxjA^SA1)Tj^%4k>4wrnl@C&`Jv zqKa4J2gzo6t3|`){9&>~$?BDymDfMkLpw3ZRyK-t!Vhd}#t&=htpj=e&unLPN_YY!39 zj~a=?b+xUlmUhTAwrHJ=*LmyIhHND%xaIeO#s1Vkfmj4iP^f%$+h&<1S>V6!w3k@Z zgWUSjq78YCD;NV}L5dQkz~_|@lMQ9i@B3c&gz!c|RPy&g5cap|pkeZ^ZcT0Q#CFup z7qR;STAxv{LPNcGODpuSL=&^AU?p+w`RlQwxKxlHnKpPXJF>R%Bohx|z_-8IMa`0# z{mWj7YyE~K?Ca3#@(@4Pb90#yKB%C+k@(=C^);=iF$fhc&2p6)glcXK9M!t4*KWzg zLznnGg9X3XbJUOpZmfTObo~o+9t&pR=WdZAHt{D2j-dW5(zLh#npWNrh|o`ZcCJ8z z30{agRA6{|vTbdBX(4qSeNfF1zw#?pmm&c8ow8fjP~re zGSfDwIgxyL{O?q2EN7KV&`*U6cKzl9=%-~~V?Frz@t&J9HEM!ZrFY_5)39zQ zWLQKj>rd`2ie9*Lz?fFh@Vrb+*Rh^8cY%>`wqHh<6@@>&8gO~g$rvGKAt#E8a(gOP zJWzXqg?eCMXFjk(2;=xFgSxsmPdPjyG~ifs+8+3t>=pdHwpNEdJ$R=5z5MBeeu1{> zVDcxotUB7)4M?#jK0hUHb@8jylVkN(v^O&dXYX$PUwp!sgwRG-v4OAls4u5BD};X3 zrY#Fb+zoBGy)iS@StaCWxS#PmIikdu z6aC~QRJkK1i`=aU3N}<*M5nWqRggEz}0Rg?5hL5WNC;_j!b^-^|9UV z6`eIDJZACW6T|*+2|b8AGALqx8See8^;0$1edGIIxQxe+&kD~rur&&&e0Kt>5(MUQ z>bYxJ)pVw_uezZhmtiLs{N)LLFUBSffZ#jIU7uOHz)@wKe+VoiF<1M$7xVvpW7jxj zd#R+gwRI}HcI)t}*s9dx-f^`(v(ucWe#9_!a*Z|XU`n8^_*`(bo5cmUNx|vU)0H|~ zahgtyCkC!fe&aEZu3!K^aUZ`ObT3X`o_<;R;2_}dYq3zVAOR#-TxDqG^4DUPsX8Zt zF5UJ~ygPT>^@oE(Ti+YPF{Tq#e<1_wBTnRvk|G|U1O5XnxWwvK%fTH-@DhBiKImog zQoCP&ksBnA(kAu%;yPyXKZ#K_L?V&smHv`Tr;hHzZurO9Egit=O)K}qJy8q4e>Dvf zkE#!Qn0FqBFEfNPMM+mYT0mA!u!hA$kyHNwJE@n%Ht&`Hb}0|`-Ge7d9!!j5YIpLI z@za{$R@0_ekjiN7dIz$VoAB)wWZ>m9=)Kpk${dZdnWD1;KrL?Byl!vM|EcytT1oIK zGmlDD9)1biLIB|wd+@`D8od==vzLmlWi{VC8Rg+In`l9^_*&W(%38aR7w=NpaXKA~ zr(Q63bP~et*mC}?7nbrVhmO4}F?;%|1nYi4ku8V9N-1wJ?lg|?0bl&QS81Y;wz$(o z=Ebt=g+5wLvd(Ny9wn|^zn&L2e)7)!MXJTnvR&Dr{rtC5pHZD3<)3Su^|`przaqN#8aC7wXELoArmlL- z`NZSN^(2|n+?9N06`}3YKSgIJ+k1!cJ_~~u=KKSFf6WBL*d2TupNg;XgpPDE zcBHZeB+d}f)006f_$xMMI(F}KEt72pJCU=v;UccR&|5`y$MxejD-aSwP!#E1p>Q)T zGg5S`^qP_dDz|)MQx(AN$#E?k z;RqWMBi#Ws4u6X1rQ(slt~pYhTi!^OymG{KmuCh9;b#0lB8@3&rM~J?W8Gv1uKN2< z`iW+I*t)y>K+MQwQ3@fA%UUR&TjNO--oFJ{q}0#b2(mG`3U~OLCOP0 zwQcEjQPcfVXWEhB-FO$q8!CKHiO&ySJtMXS?2q23`S4JSOyRh|sk$b>2zySwdAsgD zKW^*oMV;P6=05lcFP`D0eY<)P=F)->soy)1KCc|j1RkY9r^WUSpsNBfG&SY~-wwf^ zz_jl)<0sC-JKJmG`?Vv?m=*!Tz7O^haegKPLrR2RuMwH?rXaZuWX;rve#VCXBOI3z z;1M8r><^am)M%ba5B>DI^FP;Oy)|m;uBI3AjXW|Th4^9POaO*psr!!IPLV3KaM0$1 zRK3}$p8^^Fz;o1M)$?FR^RvGlK+O7N*PLyHZ5H3JN6}0G=@NKr;>gbK`714%6P`oUE*hAn(WB$aPpdd}Xz|Jn@MB97? z?w*DEJ&#D&G+xCO3i=XTLXQ)A?4~AWXhF*C?1#G#R2o~&8o6|vv3k&e^|?XE)x3Yl zN!GtU(zqKw6`TrFOuSKg`-abkgFAmo>&m3Wh<{K&_LUJ(J7TZ3rad52@cTfEYo(hh zt{n(7Bv=GI`|dd;D6;QuAQlaumnFa_=+wA?ADO`#yH#UmC_@&pu{N1r%F38Ex3yk9k8nqw~sFyF;{AwG2>=nY03 z$94CcLfMJvBoI)ZSX)UKg)6-L{aHhz&F#{fAf-($J-uy?^&}&BCXVId|91bV zu9{SSHmA~n>3s}eqc}D6*k!IyT+#zqcg}F%asnVf5@{G|S*CU*xhE+9ars&#c+2&9b$ro83l){NN z9Z-Hc%0ul5-%awu<;NoTgd||E)!2hT20_p>!l)d|gDVGUxAflt9ymvc>embM{0vO_ zK(StqB1r$nk^bJXHdqSLOGiBW3<2(jU%`g!WHbeP5=xob45OVOFSY2w9nW|$sBdgd%Lu}5zw)9J_KKmz)_Sy4HCRj zQHlj=vsW-ihe0xE?7TVU)rd`Wm1KnHVZ|fiIx?pfO+X<8lEC@v_^Wt`zz7~7gq3d6 zEoStcf8xTjz6a;4*nlpKcIP$GQXV1p9JXWwb&NpXoBQ=UBZSc}3qa(PYc?0>bNvLf z)#rQ$3wLgcwh-732Y`ok0u##OlS(!r1Re=QuqI|o4&JSOmB@GN%B(0ocuE?rF|CAYO;2V10DuH6IV#DU(Fq!E3uXs>k)owBiTJ+dcVJ}Z z>{a4WJov)om#iCY3NWQSQ*CUt>7a3HFy<4$-H;&Er;rJOy)0&|AjAyupn5Tvi{gFw z_9Y0$U4kd-CP6>yBm>ZthBhe&jN9iCaR>m#0%MJIij?;M5>)LJh@T-H;Fu){6k2|> zB8CA3OG9;E41uVW`3Zp5WbufrLfLWQAQ*iKc3p-#GXU%muV|7_+J*7>T_oCX0{@iqdH2D$ zNZ-S9A#F971a1Z$E+e zH@^1ZX2lCF=kvNnRoISofsD{jgLFSW=~AC(i-ymVAx*Z#7~ICG9*d@zw10v=KEY;7A?i4Pp(;_hPNmHB$ebD^v zip2Z7oY0fQXhoObbpI0Xlz70usH5QN5c1xs;96Hme}BQ~os^eL{}H4sQ~|Ut(_cec z)s6wzi4+VET*crK(;Vf<&cCa4k1bg4J&?LD^z053Fx~{+p{guBS?-((^kBot5LFgA zo5@U*WQY*&33~>oppp^gjp zf#evO?}|T%3VxRhJoaPPw_3_fbYQuQ5@9y2XmW3Vf>1Wxv0$s=jF!joi+iAzRa#F^ zUHpQzyt5yqMMoZ@`R^PlyfVsU}3ciY%L?60ygy?6ZjBe3taQV{@ln@d|7_6G~9y62f^2 z`i+3`SK!`Y|Kr<||J$s9#Umx(!(-rnl^ZgSoPBfoAUViGH18#PUe@d=DO-7EnlOKHw&Cg&e3Ga&_ ztqXQN88{(+WH19F6DM{5C9~cM@_7F+-tEXM?zw(eVWhOy@q+aN*A^`M4FHf`1r3>lBW8A)n!a|u-*%#0nIMv1vPJKCEcsEMzp8Es6wju-ytU~CYr8q7nTf+0Gx+K)TKrLM5R63j^nsF(L8Sb#X-!Qm6r0`A>r zY0Og5RK1L_L!$%l9*RZ*9?mM$9)W|9x_^5FJ<%e}f`mFkkN+>N(8=^y%GU z6b?Z*E`D~R2e7=;b2617*rpltU*u>&r~YroLer6F4X1B0+Z|>@(?_QB80bF<|8It! zDzv{~RUNRq7r=h3)BrFahpZ1|L)Umm!~yCJs57R=_)i1|B48PK;43v;;E5q%`i~At z0)g81V*Vd8+}f!9c9X}UXfTy~i3h%JbL!%(9JC+Q6ZxWmNl%2Aa7i=izuD^pkDD$7 zht=NGgTobHiu0%9g2drC?4ma@^@zw*%Y`>D9>2ppN&w}vr=flQ9Un((kg|(R|o2NC*)=Hxw3l(K<^EhzC%B1oovdnKEWFM6({L4 zN(F%*UcO2Tc?-(v0!t*-S*E5;cnD32csJfx=uP`H6czuaa{B@c=5#94a~+$+Bg9F@ zxBm?|YaEwaxh=zkv(7uE>6;96U0$*o^AN%l@u!TD4Ier^aa=D_K%fx<*TXVpb0zz3 zgE(*ux_xzSW6$#nS$=hg<$sm~?18vd!*|3#jM9cPDfEr0*M-bi%&cXVC*?iNT zQT?jG;Y@M@@T%nwxd?_#|1G=zNDRsv-OF!10=8NF+~2Th2lU3zy_wV9`4aAe8_@xr#6Rhr5G4Zf=)bmDwx@SYUI0N}V2mWxEH6FQ zr+eJ^g65?t!5a~Bc?P{lK#nm-Rc*r|HiycfmK_#7__A8YsZRjy}APv3tg5veZlKiEv% zdi2cpnWs7%Os|%o+=wRTF{Iatip0&M(hZ*+w=s5vZkul^sqQX~tiH%sxv_ENat&|T zOSV?ewE%;jnqgfmQSt2Rr^T&|?@zge?ZRaqkSP zaRS@Nz%{5Guu3@_KK);Jjd27Kwh++zAi!6Oe$fO8^WS5`Ey;s56fC6*hxtHi!Z^hC zSjFKGkzhB+hmEg}65hGXFraCnGfLFIHT>wnW#A~2Ikk=EA)x-IohGC0rE+;kSk#zI zl(hvIcs2FG+DRHkUICl@47V^KUSv|Aw|;J+@>e_7WTRF?cAp2aWOv_pa$}FD@c3r34i+!M3u5shn!q z)C|20P1&%?$xRMyYs>kA9t7nPUtxqg7#q-8c1~u9^%G*Hcl~X!?7WP)q|W|R1o$cP zRw?M>jsKoC#iqJ52lK6j16H@m1^xbJe)Irtto>V- z)OLXYDg2x|Hg$~&R!l|4D$bte^k2f^l%qUD(QR692H3EBvw%g4+%v{yC^VdcHcM z)t;ZZF4~W~Cwp~re%6*Z$&qM?QF!aeJC(4vSM~fkrU^&H<@M#lQPuVJ#sT_TJp?(l z1W@?QV;PRE!51PmE{2#Q2o66@Z5h2<4^FncK}bVWa-WY)$!_Hqar8u-M>bHo?f%$% z?~CH##UDvQ(W!m8gwf-ypbJ5nd4n0!K%6o(X`wv~k&*yo>WJ7yP#$n81xTV(V}XZx zbsvu~ZxPZ?a!8+ra1s2z$72=T@_B}49~^TN%+?|KZvqd-)>D8q3B5iEl#w4%II1fA zh5@)UhLOUx>_^37fxh9YPCAnZV?uKQcKO2DMA_Z5qc^+tbssRA?C_(taNOmc6D77) zx|{RoNduB*AdkH{xxxUnaLDsiDg5%PhDPkczZwibOKSu; z#93+e?=CyEQMTVS!*~lbY-?hFRjiKj8v=Kf=3@pZCk~u!Gb=S4)!&{rSL$>JA6Vh) zc;2nOY1@F%kQQ-YNoKxt;3@+!BLrCA71vYXK+OojIb~O%p1}tjN<41J|3%~vfqz?| z(G?eoxb25DQI14lB4he34E(OW%*4e?DI>HYv=0gwkQkB;?NoU*_ZUHTx0*xW23o&7 zkIGEG)Ua_b2!R=mds}Bhfv&nCO~fk3Ml^IGbnhcAi!U*UBj2i=0AH1xduqf3aIwEn zKC#FItz(Rb@OOfbgf#ZB*!2zbG2q^wOW(fCo4};)g~WNF3W-bACqVI9{OsiWo@N!j z5S6yj$AAI%A@bk&^Go14gwDA2C?y~mfwONBr!Cr_gG|l?XYu%(ee69iLi~zlWA>|K zhEX^lB!G;I?&js(F^T6(`n%EBCS>SR;yV;awkvh)G(!X2$GLWw%*y~UF_GY|k5Q<+)c~3{=`27Uo zP|=CItGe$hZl{OI_~bpGyx!fYSKv5IAE+g*v!XRsn19$nc>40z?DNc5{_O6 za>&>^zu&*q@27LXtiwKFL$UaS3fv-(oHb`5Y@yOMHzf$_`4J~U0`w>kmCgbFA>l@% zzcQlF6tU2nRtg1MoT&MDTo0`7C>5oAM)fFY8wg=2NZcPJyub}^A*0Js33)T|zZjYK zK>ClKl_il>MCVhE4QtIhnJ^@-frIeS3v9#zzn9V?tjrcy{p17mnM|AnJ~>2x$x6gA zUrQ;9yUZl_#;QK|aqhcGU9srxBO}0Cq{yRw&k5ztL*wy2O4I2m$mHh#Xucjwak{#+ z`A7wBvlj9`wz02ri<>{)&vPqpjU*Ty@@`V#V(-i$Llh4UL0`Pr{bjjR`fPQr+bcHI zOxm>V?p4hm`8DkG-llZtG&FH8$?yUz^Q&!OmqFCLwmNlsg7q|4 zB-*>9ifsPjCdqHnIfsvhZ5n%dQl%L9rrtBUYuLA;X4QLURxWybu+VyKRta|^#aShj zbRBB0_w8QnG7Go=m-Vvza{Fz}`k8==JIM6g7D_?vAbT2*5CTW_g62w28Z+|HK1jh2 zKoyWbDB-_A%rk z!v(n<4rtzuXHWpsUleYAB#C$kyeYU@>8UILPkPLtX|wRfdA(KI z@oCOpFWMyu&GIs2aN#A5aookrBXJiIBr|6zGk?k+uDR#dQ?JY9hE#@P$57f)mi0JB zoPggCJfk1=ni1IeG`Obyq&k8fep}_tKA!bs^X9u`!0L`TewI+Af_LRuW18B=*2%lC z*~C5N3fnfo*)u9zEuE1>dhEyB33+@AR}z?`gNW_Oi6^hj@3hWu;(rk%7A;q<-_Pla zbVDu#%)azt@E@bP$kiFSXF=&FDnx|F8GBS8{c6*X&OYgK>QvwSnQSP1zERg5p~z*U zaA+ahJXq4gjT-q$*DfP;1~-B)Ts60fAZT7WvOa6IR}ciZ*$7R!T1DU@k;BxceD{tCy>5dOc|2UP>h%mjifuoYeQ+Dao~X|8ZbLze(ZkcGz*1#Pi&$d;S^K0MTNtkf;y0)%#*90%k{8o)7FT5&x zsygR9b>-;>4-2Mqb&{=SzT;>_%W3QFkWcQnrW$Ztic5I%;9DuaNC{$c(QNqL_#3BoAs*n+6(>8{K8&|6y1_O^s?F7u7Y;3KA8gf z&YWQZ7ssi4KWL4i#;1;<=r>FY%k@R>`!V#N3$3Yd83UaQw%u>e3V=OsKO;HC9jr99 z`YeGz7)F8WpI9v}s;q!8ZNSmw&vVDd?y8eo-3Mo$-1(!a0CxY}hH+nL3-oeVG>G0> ztiQH@X0`$LSf?l0YiWYA(XB1Syh-kO|HSS=9;YyNnp)n=OJ^kmF7elAk| z$6HY2xXp&`s>}S?!XkS{F))zk^f+}YNjR)!zntnHAwl)zroGrY=;O52L}2#s<_S$> zU##O>j&`3q2BE2KgBns@m8}Jw?LVB4^@< z=RY2_sj*`|e$M|vI)0-1K#Hoa!7lAns)bYwn}Q9_>9*&>Q|&KHGYm_I3t88MptMo~CGwplZ%M`8$n2 zw7ypV_WG@MuF6Qc%_`Db+1Cd<-RpP_%OD9s=!7VTBcHNOcm0=!6o;$j`}F~**3)8i z2|B<1=~*OFV|{M^_fJay5h(>U&J6BoH?AHWPO5sN;&D|OrahikO7oN;A&nE~!tdL< zAJlf87NXW$>-NmHlfrZfe&_PA$J&l( z;wDx%uX{Z@rgp1t9~-r4%lR3*W&3IO<~zqAmo0UrQ4@>FW#a9$7$54RqklTdw>?I5 zg8hLiiyfi5*hM8*_^EV8aeu8kKFzTwhyD-;!{WmRbvS~Md+o<{Et}l4H`71Y)h=ub zN>3i#-929+=pH|cEPY?_<#MRGF<;>*Uyhf?Cfg^y#sn&xHnegVa0chMS3W6#dE2xX9l)6{-a_;kqVs~y-;EibHRf{|R;4VwL`J&4stC!z5zkJzkZ`a;?wu-OG{qp6@jR(Zt zXHlMe^#PpFTc3{an;6V$#_ehc1T z*zI-nKqfTN0soo=N{iQf-@ja?bAeU(V}ddzOwxXeTd&6FD74lmlr#EG4x2z{F7RLi zRinRk#$-lk6Ug%2+Cdgw0Wa{&5F_Q;TPputpgQGv1zvj@dS_(_Iu8VYE597Y_W8pf z&oI677tHw<)7>2FFh+g&rd1^U?Kj&q=bVG5`by6~oJ{^p~p2gb1$%B8aW5DwICuY{FjIVe0$|teWJ0 zv^STWwGSfa@4}hfY~9b;>Ye$AuF(&Np9{ddCXt+Rro3ctBA^dkxdVoz+3R6O2e2) z`b!I{vguy7&@AwW8{RGG(~qhnsqYE-?gtd^hdSXE=|BC3=V?b;x}&0az(bqp4G|ts zzJ!8Z#Yg096i%V3WEFbZdEh+pNup}U41q~p7uW*w^t{|gqUB7|3#mxzPG%UMe-zm# zx0PF<=I^fYhfBsE-j0eRwTt>(!Z(U)`orfPcz|d9zf-Aao#{01HHW!vw(0H|bA>IL zqX+lTQA4o5pE!F^r2IrG<1DC^=mR=%f4TnkEyLYY21w8P%}hM?4;@>DR>xiD^>WSj z_u^_udeXa66G^`%Q-SubI$>2uas6liKkC6d%euw0CH~37vIVB8?5@?qM+w_XXplREfdzBTf zi~SdVtt*=uUzw3n_E~DTnwd6KO}%i_?ZAr)@Xu&Jw*u2-ck$f=qQri^;SaQl6nE1- zA?l#eTQ+YJSW%qkduU4?1fEpz1cFat@eEcu(cVdoPcamdtPY zH1E#)eCMRC#8R2Z7gyHT;Cby?DEA1M_|!X0~5oEIW_|sOIZ8iVh6H{ipn|H5pmPt2PcINl6Q{zzN#?3G;}7a z_u1%B(c}+@lY7*)E9!4QrTbn9Sf5?6eVWLNO>e2<`mH;uyT@X8r>6cP z0pHxrnH2zw2uWo{)qUUOCAiARj8XBoe=`XUZz5~U@GT$Ni_U+Z!Xd(*$jlFLu^0MP zhaYSS*0R{yEK3qPQq`N8@8unw)pLBo#)6rXC#Wn2+NJ%7jK4Del>XAg%F_f~V;*hO zU~bo){`Q2Rh7l(GiOcKfsdFd~AyH{`{U%=O$_njK%VNYR6ZKW~m_Aru392l^e|b}{ zVzE0aDudRmdQ-o0VAN&d^VPt2sb82@;Z1Bfe%@yxLiFB}v%8_$ zp7ElIa7w|_!e`X2)0J<4G9%9D11%-IsAY+VwtP(t&zt$;z@on7S2#*;{aM6U;cfQ~ zRo)oaJl=llXI*M}$8x^64)uMc&%iIBefk4_utV_j2)$d(V*`eGkE!~axo43P+8U4U zj^|U8$niROKf0oLhRN7thqqi*ROYz1TjQU+OjP?d-~U_fRfR6aUbdF~6AAHd3wr6TnrD# zWPSFTFRq{cL2U`_qrzfthP6!hk_D=-_bA7`!4h;{nXN*6wkk>uMz_}trWAFlAlo|G zk*jd^oxL&V8OK>J;yo_8vc7r+Put&NM}PJ5?;z=Qb?wc6M{F-B>6CaV(Z~HIGBp;4 z)3BKDkpsP_BkGwFE?imb&;kkNDs)Nfm%hgwm|f^Y?mxCqRwqn*Ua3(9u#i6-sP~kd zrK8c)v4Py5K#qMXT|1f*aW<+(M)2+dJns)2?AQLS$<}!-+I%vc*@bSYS_ll+em|(P zT0Qw921jrqf7k>PF0|UNzX-%Fvm-l4jB921j1WP>tI%}STQ=rd4=yyXR1i*N3p`v; z=b9?BQjh>f2&mv^XDrBi#KXM(RsJ#?eEumiV-@mkI*(qa&!gX31=Fbx+_xD?cPxJs z>l2!=nDcIiH}=TS-7$K6QWrL7I3{sj*24Zv*qA&ldO>80&l!)2@`v%K*6_BMR=8%p zxJ*v(3+y0COTT~r>24K`cFMgRO8eGF#noMT_4R#;J#*m{JWwoe@S1kAwLpegBo-x9Iw~$prqt*;03D2zF3?=ysM_Q4`mH8Vq!d KwDUFXg8vUSH`cTO literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m index d525ae2c0..be5a58f9a 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSSystemMessageCell.m @@ -300,11 +300,6 @@ NS_ASSUME_NONNULL_BEGIN return result; } -- (void)prepareForReuse -{ - [super prepareForReuse]; -} - #pragma mark - UIMenuController - (void)showMenuController diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index ea7c32648..15465070e 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -2551,7 +2551,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info - filename:(NSString *)filename + filename:(NSString *_Nullable)filename { OWSAssert([NSThread isMainThread]); diff --git a/Signal/src/ViewControllers/InboxTableViewCell.m b/Signal/src/ViewControllers/InboxTableViewCell.m index 615539744..ed88dc23a 100644 --- a/Signal/src/ViewControllers/InboxTableViewCell.m +++ b/Signal/src/ViewControllers/InboxTableViewCell.m @@ -279,8 +279,9 @@ const NSUInteger kAvatarViewDiameter = 52; - (void)prepareForReuse { - [[NSNotificationCenter defaultCenter] removeObserver:self]; [super prepareForReuse]; + + [[NSNotificationCenter defaultCenter] removeObserver:self]; } #pragma mark - Name diff --git a/Signal/src/views/ContactTableViewCell.m b/Signal/src/views/ContactTableViewCell.m index c28d8eee2..ec1108789 100644 --- a/Signal/src/views/ContactTableViewCell.m +++ b/Signal/src/views/ContactTableViewCell.m @@ -249,6 +249,8 @@ const CGFloat kContactTableViewCellAvatarTextMargin = 12; - (void)prepareForReuse { + [super prepareForReuse]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; self.accessoryMessage = nil; diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h index 088b84c39..6d9fc7d59 100644 --- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.h +++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.h @@ -27,8 +27,6 @@ typedef NS_ENUM(NSInteger, OWSInteractionType) { @property (nonatomic, readonly) TSThread *thread; @property (nonatomic, readonly) uint64_t timestamp; -- (BOOL)isDynamicInteraction; - - (OWSInteractionType)interactionType; - (TSThread *)threadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction; diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 943224912..a2951e694 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -547,9 +547,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; OWSAssert(dataSource); dispatch_async([OWSDispatch attachmentsQueue], ^{ - TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:contentType - byteCount:dataSource.dataLength - sourceFilename:sourceFilename]; + TSAttachmentStream *attachmentStream = + [[TSAttachmentStream alloc] initWithContentType:contentType + byteCount:(UInt32)dataSource.dataLength + sourceFilename:sourceFilename]; if (message.isVoiceMessage) { attachmentStream.attachmentType = TSAttachmentTypeVoiceMessage; } diff --git a/SignalServiceKit/src/Network/API/Requests/TSProfileAvatarUploadFormRequest.h b/SignalServiceKit/src/Network/API/Requests/TSProfileAvatarUploadFormRequest.h index 73b36c9ba..5e80c51ec 100644 --- a/SignalServiceKit/src/Network/API/Requests/TSProfileAvatarUploadFormRequest.h +++ b/SignalServiceKit/src/Network/API/Requests/TSProfileAvatarUploadFormRequest.h @@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN - (nullable instancetype)init; -- (instancetype)init NS_UNAVAILABLE; - @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Util/NSDate+OWS.h b/SignalServiceKit/src/Util/NSDate+OWS.h index c04a47b2f..104c20892 100755 --- a/SignalServiceKit/src/Util/NSDate+OWS.h +++ b/SignalServiceKit/src/Util/NSDate+OWS.h @@ -24,8 +24,6 @@ NS_ASSUME_NONNULL_BEGIN + (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds; + (uint64_t)ows_millisecondsSince1970ForDate:(NSDate *)date; -+ (NSString *)formatPastTimestampRelativeToNow:(uint64_t)timestamp; - @end NS_ASSUME_NONNULL_END