<table><tr><td style="">jgrulich added a comment.
</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/D18394">View Revision</a></tr></table><br /><div><div><ol class="remarkup-list">
<li class="remarkup-list-item">I'm not sure if the UI for openconnect tokens is correct, I think the QLineEdit for token secret should be on the same line, and you should probably use PasswordField instead? It can be our PasswordField widget from libs/editor/widgets/. Or it's not secret in the same sense as other secrets and it will not need to be saved by secret agent, like rest of passwords? I would also follow nm-connection-editor and make tokens options visible in the main UI, not under specific button.</li>
<li class="remarkup-list-item">Your code is full of trailing spaces</li>
<li class="remarkup-list-item">How can I try this? Is there any public Openconnect server which I can use to test this?</li>
</ol></div></div><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/D18394#inline-114314">View Inline</a><span style="color: #4b4d51; font-weight: bold;">nm-openconnect-service.h:41</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 style="color: #304a96">#define NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID "pem_passphrase_fsid"</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #304a96">#define NM_OPENCONNECT_KEY_PREVENT_INVALID_CERT "prevent_invalid_cert"</span>
</div><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #304a96">#define NM_OPENCONNECT_KEY_PROTOCOL "protocol"</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Leftover from the other review?</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/D18394#inline-114316">View Inline</a><span style="color: #4b4d51; font-weight: bold;">openconnectauth.cpp:659</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 style="color: #aa4000">const</span> <span class="n">NMStringMap</span> <span class="n">dataMap</span> <span style="color: #aa2211">=</span> <span class="n">d</span><span style="color: #aa2211">-></span><span class="n">setting</span><span style="color: #aa2211">-></span><span class="n">data</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">buttons</span><span style="color: #aa2211">-></span><span class="n">button</span><span class="p">(</span><span class="n">QDialogButtonBox</span><span style="color: #aa2211">::</span><span class="n">Ok</span><span class="p">)</span><span style="color: #aa2211">-></span><span class="n">setEnabled</span><span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_OPENCONNECT_KEY_PREVENT_INVALID_CERT</span><span class="p">]</span> <span style="color: #aa2211">!=</span> <span style="color: #766510">"yes"</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Also leftover from the other review.</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/D18394#inline-114317">View Inline</a><span style="color: #4b4d51; font-weight: bold;">openconnectwidget.cpp:95</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 style="color: #74777d">// Just popping up the tokenDlg changes nothing</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">d</span><span style="color: #aa2211">-></span><span class="n">ui</span><span class="p">.</span><span class="n">buTokens</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">QPushButton</span><span style="color: #aa2211">::</span><span class="n">clicked</span><span class="p">,</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">SettingWidget</span><span style="color: #aa2211">::</span><span class="n">settingChanged</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #74777d">// User cancels means nothing should change here</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Both disconnects can be removed if you move this all to the main widget.</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/D18394#inline-114319">View Inline</a><span style="color: #4b4d51; font-weight: bold;">openconnectwidget.cpp:199</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">d</span><span style="color: #aa2211">-></span><span class="n">ui</span><span class="p">.</span><span class="n">chkUseFsid</span><span style="color: #aa2211">-></span><span class="n">setChecked</span><span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID</span><span class="p">]</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"yes"</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">d</span><span style="color: #aa2211">-></span><span class="n">ui</span><span class="p">.</span><span class="n">preventInvalidCert</span><span style="color: #aa2211">-></span><span class="n">setChecked</span><span class="p">(</span><span class="n">dataMap</span><span class="p">[</span><span class="n">NM_OPENCONNECT_KEY_PREVENT_INVALID_CERT</span><span class="p">]</span> <span style="color: #aa2211">==</span> <span style="color: #766510">"yes"</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Leftover from the other review.</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/D18394#inline-114320">View Inline</a><span style="color: #4b4d51; font-weight: bold;">openconnectwidget.cpp:256</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">data</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">QLatin1String</span><span class="p">(</span><span class="n">NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID</span><span class="p">),</span> <span class="n">d</span><span style="color: #aa2211">-></span><span class="n">ui</span><span class="p">.</span><span class="n">chkUseFsid</span><span style="color: #aa2211">-></span><span class="n">isChecked</span><span class="p">()</span> <span style="color: #aa2211">?</span> <span style="color: #766510">"yes"</span> <span style="color: #aa2211">:</span> <span style="color: #766510">"no"</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">data</span><span class="p">.</span><span class="n">insert</span><span class="p">(</span><span class="n">QLatin1String</span><span class="p">(</span><span class="n">NM_OPENCONNECT_KEY_PREVENT_INVALID_CERT</span><span class="p">),</span> <span class="n">d</span><span style="color: #aa2211">-></span><span class="n">ui</span><span class="p">.</span><span class="n">preventInvalidCert</span><span style="color: #aa2211">-></span><span class="n">isChecked</span><span class="p">()</span> <span style="color: #aa2211">?</span> <span style="color: #766510">"yes"</span> <span style="color: #aa2211">:</span> <span style="color: #766510">"no"</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Also leftover from the other review.</p></div></div></div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D18394">https://phabricator.kde.org/D18394</a></div></div><br /><div><strong>To: </strong>enriquem, jgrulich<br /><strong>Cc: </strong>pino, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>