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

QR Code generator #1167

Merged
merged 6 commits into from Oct 19, 2018

Conversation

@adolfogc
Copy link
Contributor

commented Nov 4, 2017

Description

This PR is an alternative to PR #1001.

Motivation and context

This is an improved version of PR #1001 (it also uses libqrencode, instead of qrcodegen).

How has this been tested?

Manually on macOS.

Screenshots (if appropriate):

Screenshot

Types of changes

  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have read the CONTRIBUTING document. [REQUIRED]
  • My code follows the code style of this project. [REQUIRED]
  • All new and existing tests passed. [REQUIRED]
  • I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • ☑️ My change requires a change to the documentation and I have updated it accordingly.
  • ☑️ I have added tests to cover my changes.

@adolfogc adolfogc changed the title [WIP, RFC] Alternative implementation for feature/764 [WIP, RFC] Alternative implementation for feature #764 Nov 4, 2017

@droidmonkey droidmonkey changed the title [WIP, RFC] Alternative implementation for feature #764 QR Code generator Nov 5, 2017

@droidmonkey droidmonkey requested review from droidmonkey, weslly and phoerious Nov 5, 2017

@droidmonkey droidmonkey added this to the v2.3.0 milestone Nov 5, 2017

@adolfogc adolfogc force-pushed the adolfogc:feature/764-qrcode-new branch 5 times, most recently from c2ba7dc to db5ca1d Nov 6, 2017

@adolfogc adolfogc force-pushed the adolfogc:feature/764-qrcode-new branch 2 times, most recently from f43c80a to a3ba5d8 Nov 18, 2017

@adolfogc

This comment has been minimized.

Copy link
Contributor Author

commented Nov 18, 2017

Having finished to organize the GIT history for this PR into a better set of commits, I consider it to be ready for review.

@adolfogc adolfogc force-pushed the adolfogc:feature/764-qrcode-new branch 5 times, most recently from 4ef4de7 to d17156e Nov 19, 2017

@weslly

This comment has been minimized.

Copy link
Member

commented Nov 22, 2017

I'm not sure about the auto-close feature. An user with a bad camera on an old phone may take more than 30 seconds trying to focus a more detailed QR code like the one in the screenshot.

@adolfogc

This comment has been minimized.

Copy link
Contributor Author

commented Nov 22, 2017

@weslly How much time would be reasonable? 60 seconds?

@lenucksi

This comment has been minimized.

Copy link

commented Nov 22, 2017

@adolfogc how about adding a configuration setting for it. I guess 45 seconds should work with most phones, so a default and maybe a few common options would be nice?

@weslly

This comment has been minimized.

Copy link
Member

commented Nov 22, 2017

45 seconds is fine for most modern phones but I would prefer not having the auto-close. I think most users would just click the close button before the timer runs out when they are done.

There could also be cases where people open the QR code dialog before getting their phone ready and would have to open it again.

@weslly

This comment has been minimized.

Copy link
Member

commented Nov 22, 2017

@adolfogc Maybe we could have something like this instead:
image

@adolfogc

This comment has been minimized.

Copy link
Contributor Author

commented Nov 22, 2017

@lenucksi @weslly I'll modify the auto-close feature as follows:

  • use 45 seconds by default
  • allow the user to disable it by using the checkbox located at the left side of the text (this checkbox will affect the setting globally, not just for the entry for which the QR code is shown)
@weslly

This comment has been minimized.

Copy link
Member

commented Nov 22, 2017

@adolfogc as long as the user can disable it, you can leave at 30s

@adolfogc adolfogc force-pushed the adolfogc:feature/764-qrcode-new branch from 30e4be5 to 5329a56 Apr 30, 2018

adolfogc added a commit to adolfogc/keepassxc that referenced this pull request Apr 30, 2018

Add feature keepassxreboot#764
- Improved version of PR keepassxreboot#1001.
- Uses libqrencode instead of qrcodegen.
- Refer to PR keepassxreboot#1001 and PR keepassxreboot#1167 for extra details.

@adolfogc adolfogc force-pushed the adolfogc:feature/764-qrcode-new branch from 7fc4d7e to af7329c May 20, 2018

adolfogc added a commit to adolfogc/keepassxc that referenced this pull request May 20, 2018

Add feature keepassxreboot#764
- Improved version of PR keepassxreboot#1001.
- Uses libqrencode instead of qrcodegen.
- Refer to PR keepassxreboot#1001 and PR keepassxreboot#1167 for extra details.
@droidmonkey

This comment has been minimized.

Copy link
Member

commented Jun 11, 2018

@adolfogc @phoerious @hifi do you think this needs anymore work?

@TheZ3ro

This comment has been minimized.

Copy link
Contributor

commented Jul 3, 2018

Status on this PR?

@adolfogc

This comment has been minimized.

Copy link
Contributor Author

commented Jul 10, 2018

@droidmonkey, @TheZ3ro: Sorry for the late reply guys; due to work, I haven't had the chance to work on this PR lately. There are still some changes I'd like to make.

@droidmonkey

This comment has been minimized.

Copy link
Member

commented Aug 26, 2018

Hello @adolfogc, will you be able to make your changes? I would love to merge this in to develop. If not, can you describe what you want to change and maybe someone else can do it?

I rebased onto develop for you.

@droidmonkey droidmonkey force-pushed the adolfogc:feature/764-qrcode-new branch from af7329c to 0156e3c Aug 26, 2018

droidmonkey added a commit to adolfogc/keepassxc that referenced this pull request Aug 26, 2018

Add feature keepassxreboot#764
- Improved version of PR keepassxreboot#1001.
- Uses libqrencode instead of qrcodegen.
- Refer to PR keepassxreboot#1001 and PR keepassxreboot#1167 for extra details.
@droidmonkey
Copy link
Member

left a comment

I also recommend moving the "Show QR Code" into the "Show TOTP" dialog which would then open the QR Code dialog.

m_secUi->closeTotpExportSettingsDialogCheckBox->setChecked(
config()->get("security/AutoCloseTotpExportSettingsDialog", true).toBool());
m_secUi->closeTotpExportSettingsDialogSpinBox->setValue(
config()->get("security/AutoCloseTotpExportSettingsDialogTimeout", 45).toInt());

This comment has been minimized.

Copy link
@droidmonkey

droidmonkey Aug 26, 2018

Member

I personally think this setting is unnecessary. Just fix it at 45 seconds. Will make this PR more streamlined.

@droidmonkey droidmonkey dismissed stale reviews from hifi and phoerious Aug 26, 2018

Changes made

@adolfogc

This comment has been minimized.

Copy link
Contributor Author

commented Sep 3, 2018

Hi @droidmonkey, sorry for the late reply. Thanks for the improvements you made in cdd26c3! I'm currently unable to work on this PR, so I was wondering if perhaps you can finish it by implementing these changes:

  • remove the unnecessary setting and fix the timeout to 45 seconds, as you suggested
  • close the QR code dialog automatically when the DB gets locked, as suggested by @DJCrashdummy

@droidmonkey droidmonkey self-assigned this Sep 25, 2018

adolfogc and others added some commits Apr 30, 2018

Add feature #764
- Improved version of PR #1001.
- Uses libqrencode instead of qrcodegen.
- Refer to PR #1001 and PR #1167 for extra details.

@droidmonkey droidmonkey force-pushed the adolfogc:feature/764-qrcode-new branch from cdd26c3 to cfb9e7a Oct 18, 2018

@droidmonkey

This comment has been minimized.

Copy link
Member

commented Oct 18, 2018

This is ready for rebase merge.

droidmonkey added some commits Oct 18, 2018

@droidmonkey droidmonkey force-pushed the adolfogc:feature/764-qrcode-new branch from 9b6b3cd to 3830bef Oct 19, 2018

@droidmonkey droidmonkey merged commit bb16dc6 into keepassxreboot:develop Oct 19, 2018

3 checks passed

CodeFactor No issues found.
Details
Ubuntu Linux (KeepassXC) TeamCity build finished
Details
Windows 10 (KeepassXC) TeamCity build finished
Details

droidmonkey added a commit that referenced this pull request Mar 19, 2019

Release 2.4.0
- New Database Wizard [#1952]
- Advanced Search [#1797]
- Automatic update checker [#2648]
- KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739]
- Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439]
- Remove KeePassHttp support [#1752]
- CLI: output info to stderr for easier scripting [#2558]
- CLI: Add --quiet option [#2507]
- CLI: Add create command [#2540]
- CLI: Add recursive listing of entries [#2345]
- CLI: Fix stdin/stdout encoding on Windows [#2425]
- SSH Agent: Support OpenSSH for Windows [#1994]
- macOS: TouchID Quick Unlock [#1851]
- macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583]
- Linux: Prevent Klipper from storing secrets in clipboard [#1969]
- Linux: Use polling based file watching for NFS [#2171]
- Linux: Enable use of browser plugin in Snap build [#2802]
- TOTP QR Code Generator [#1167]
- High-DPI Scaling for 4k screens [#2404]
- Make keyboard shortcuts more consistent [#2431]
- Warn user if deleting referenced entries [#1744]
- Allow toolbar to be hidden and repositioned [#1819, #2357]
- Increase max allowed database timeout to 12 hours [#2173]
- Password generator uses existing password length by default [#2318]
- Improve alert message box button labels [#2376]
- Show message when a database merge makes no changes [#2551]
- Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790]
- Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.