Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix & make clearClipboard more robust #359

Merged
merged 5 commits into from Mar 14, 2018

Conversation

@lukedirtwalker
Copy link
Contributor

@lukedirtwalker lukedirtwalker commented Mar 12, 2018

The current version had 2 bugs:

  1. The clippedText was never cleared, that isn't that much of a problem
    since it is overriden anyways
  2. The condition to check if clearing should happen was always true
    since it compared the clippedText member variable with itself. The
    clippedText variables that are create above the condition are out of
    scope.

I fixed these bugs and clear both clipboard types if they contain the
given text, ignoring the setting, which should make it more robust.

@annejan annejan self-requested a review Mar 12, 2018
@annejan annejan added the bug label Mar 12, 2018
@codecov
Copy link

@codecov codecov bot commented Mar 12, 2018

Codecov Report

Merging #359 into master will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #359      +/-   ##
=========================================
+ Coverage    2.92%   2.92%   +<.01%     
=========================================
  Files          36      36              
  Lines        2699    2698       -1     
  Branches      360     361       +1     
=========================================
  Hits           79      79              
+ Misses       2619    2618       -1     
  Partials        1       1
Impacted Files Coverage Δ
src/qtpasssettings.cpp 2.94% <ø> (+0.01%) ⬆️
src/qtpasssettings.h 0% <ø> (ø) ⬆️
src/mainwindow.h 0% <ø> (ø) ⬆️
src/util.cpp 6.89% <ø> (+0.33%) ⬆️
src/passworddialog.cpp 0% <0%> (ø) ⬆️
src/mainwindow.cpp 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update baf5ea8...1f7d97c. Read the comment docs.

@coveralls
Copy link

@coveralls coveralls commented Mar 12, 2018

Coverage Status

Coverage decreased (-0.002%) to 1.774% when pulling 1f7d97c on lukedirtwalker:fixClipboardClear into baf5ea8 on IJHack:master.

The current version had 2 bugs:
1) The clippedText was never cleared, that isn't that much of a problem
since it is overriden anyways
2) The condition to check if clearing should happen was always true
since it compared the clippedText member variable with itself. The
clippedText variables that are create above the condition are out of
scope.

I fixed these bugs and clear both clipboard types if they contain the
given text, ignoring the setting, which should make it more robust.
@lukedirtwalker
Copy link
Contributor Author

@lukedirtwalker lukedirtwalker commented Mar 12, 2018

I'll rebase to fix the conflicts

@lukedirtwalker lukedirtwalker force-pushed the lukedirtwalker:fixClipboardClear branch from f921898 to 9e3d0d3 Mar 12, 2018
When the template is not used the passdialog still showed the template
fields. With this commit the setting is properly respected.
@lukedirtwalker
Copy link
Contributor Author

@lukedirtwalker lukedirtwalker commented Mar 13, 2018

I have some more changes I will want to commit. Should I just create a new PR? Or append here?

@annejan
Copy link
Member

@annejan annejan commented Mar 13, 2018

Appending here is fine by me @lukedirtwalker

@lukedirtwalker
Copy link
Contributor Author

@lukedirtwalker lukedirtwalker commented Mar 13, 2018

@annejan added some more commits, they don't really have to do with the initial fix. I think it is best to review commit by commit.

@annejan
Copy link
Member

@annejan annejan commented Mar 13, 2018

I will later tonight . .

@annejan annejan merged commit c642ff1 into IJHack:master Mar 14, 2018
4 of 5 checks passed
4 of 5 checks passed
codecov/patch 0% of diff hit (target 2.92%)
Details
codecov/project 2.92% (+<.01%) compared to baf5ea8
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
linthub Linthub has cleared the pull request, no code style suggestions found.
Details
@lukedirtwalker lukedirtwalker deleted the lukedirtwalker:fixClipboardClear branch Mar 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants