<table><tr><td style="">apol added inline comments.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D16279">View Revision</a></tr></table><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D16279#inline-89811">View Inline</a><span style="color: #4b4d51; font-weight: bold;">uploadjob.cpp:42</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">m_uploadTimoutTimer</span><span class="p">.</span><span class="n">setInterval</span><span class="p">(</span><span style="color: #601200">5000</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">connect</span><span class="p">(</span><span style="color: #aa2211">&</span><span class="n">m_uploadTimoutTimer</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">QTimer</span><span style="color: #aa2211">::</span><span class="n">timeout</span><span class="p">,</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">UploadJob</span><span style="color: #aa2211">::</span><span class="n">uploadTimeout</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">If this is a workaround, explain it here for the day when someone has the idea to remove it.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D16279#inline-89809">View Inline</a><span style="color: #4b4d51; font-weight: bold;">uploadjob.cpp:62</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">description</span><span class="p">(</span><span style="color: #aa4000">this</span><span class="p">,</span> <span class="n">i18n</span><span class="p">(</span><span style="color: #766510">"Sending file to %1"</span><span class="p">,</span> <span class="n">Daemon</span><span style="color: #aa2211">::</span><span class="n">instance</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">getDevice</span><span class="p">(</span><span style="color: #aa4000">this</span><span style="color: #aa2211">-></span><span class="n">m_deviceId</span><span class="p">)</span><span style="color: #aa2211">-></span><span class="n">name</span><span class="p">()),</span> 
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">                <span class="p">{</span> <span class="n">i18nc</span><span class="p">(</span><span style="color: #766510">"File transfer origin"</span><span class="p">,</span> <span style="color: #766510">"From"</span><span class="p">),</span> <span class="n">m_input</span><span class="p">.</span><span class="n">staticCast</span><span style="color: #aa2211"><</span><span class="n">QFile</span><span style="color: #aa2211">></span><span class="p">().</span><span class="n">data</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">fileName</span><span class="p">()</span> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Use <tt style="background: #ebebeb; font-size: 13px;">emit description(...</tt>. It helps when reading the code, to see it's actually a signal.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D16279#inline-89808">View Inline</a><span style="color: #4b4d51; font-weight: bold;">uploadjob.cpp:98</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="bright">        </span><span class="n"><span class="bright">qCWarning</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">KDECONNECT_CORE</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright"><<</span></span><span class="bright"> </span><span style="color: #766510"><span class="bright">"error when writing data to upload"</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright"><<</span></span><span class="bright"> </span><span class="n"><span class="bright">bytes</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright"><<</span></span><span class="bright"> </span><span class="n"><span class="bright">m_input</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">bytesAvailable</span></span><span class="bright"></span><span class="p"><span class="bright">();</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="bright">        </span><span style="color: #aa4000"><span class="bright">break</span></span><span class="bright"></span><span class="p"><span class="bright">;</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="bright"></span><span style="color: #aa4000"><span class="bright">if</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">!</span></span><span class="bright"></span><span class="n"><span class="bright">m_timer</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">isValid</span></span><span class="bright"></span><span class="p"><span class="bright">())</span></span><span class="bright"> </span><span class="p"><span class="bright">{</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span class="n">m_timer</span><span class="p">.</span><span class="n">start</span><span class="p">();</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Why are you checking for validity? Are you trying to do isActive?<br />
Actually, It seems like it should always be called there.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D16279#inline-89813">View Inline</a><span style="color: #4b4d51; font-weight: bold;">uploadjob.cpp:120</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">        <span class="n">m_input</span><span style="color: #aa2211">-></span><span class="n">close</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span class="n">disconnect</span><span class="p">(</span><span class="n">m_socket</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">QSslSocket</span><span style="color: #aa2211">::</span><span class="n">encryptedBytesWritten</span><span class="p">,</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">UploadJob</span><span style="color: #aa2211">::</span><span class="n">encryptedBytesWritten</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Is it really necessary to disconnect? the socket shouldn't be working anymore.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D16279#inline-89807">View Inline</a><span style="color: #4b4d51; font-weight: bold;">uploadjob.cpp:129</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="n">qCDebug</span><span class="p">(</span><span class="n">KDECONNECT_CORE</span><span class="p">)</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"encryptedBytesWritten: "</span> <span style="color: #aa2211"><<</span> <span class="n">bytes</span> <span style="color: #aa2211"><<</span> <span style="color: #766510">"encryptedBytesToWrite: "</span> <span style="color: #aa2211"><<</span> <span class="n">m_socket</span><span style="color: #aa2211">-></span><span class="n">encryptedBytesToWrite</span><span class="p">();</span>    
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">bytesUploaded</span> <span style="color: #aa2211">+=</span> <span class="n">bytesUploading</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Wrong indentation.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D16279#inline-89806">View Inline</a><span style="color: #4b4d51; font-weight: bold;">uploadjob.cpp:193</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">setError</span><span class="p">(</span><span style="color: #601200">2</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">emitResult</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="n">disconnect</span><span class="p">(</span><span class="n">m_socket</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">QSslSocket</span><span style="color: #aa2211">::</span><span class="n">encryptedBytesWritten</span><span class="p">,</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">UploadJob</span><span style="color: #aa2211">::</span><span class="n">encryptedBytesWritten</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Emit after everything is wrapped up. Otherwise things could happen right there.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R224 KDE Connect</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D16279">https://phabricator.kde.org/D16279</a></div></div><br /><div><strong>To: </strong>eduisters, KDE Connect, nicolasfella<br /><strong>Cc: </strong>apol, broulik, nicolasfella, kdeconnect, skymoore, wistak, dvalencia, rmenezes, julioc, Leptopoda, timothyc, jdvr, yannux, Danial0_0, johnq, Pitel, adeen-s, SemperPeritus, daniel.z.tg, jeanv, seebauer, bugzy, MayeulC, menasshock, tctara<br /></div>