aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/QrCodeScanActivity.java
Commit message (Expand)AuthorAgeFilesLines
* go to directly to certify screen after nfc importVincent Breitmoser2015-02-271-224/+0
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-1/+1
* Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-2/+6
* Rename multi certify files to certifyDominik Schürmann2014-10-261-4/+3
* Fix notify after certifyDominik Schürmann2014-10-261-3/+3
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-231-10/+8
* Externalize QR Code scanning and import into its own activity for better code...Dominik Schürmann2014-10-231-0/+223