aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* split up wait/action yubikey fragmentsVincent Breitmoser2015-03-214-64/+137
* work on ad-hoc yubikey import supportVincent Breitmoser2015-03-213-18/+270
* first steps toward yubikey activityVincent Breitmoser2015-03-2124-445/+585
* Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2117-176/+163
|\
| * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
| * Reworked Notify classManoj Khanna2015-03-2017-173/+130
| * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| |\
| | * - Added footer so that the Floating Action Button won't block the last few it...Kent2015-03-201-2/+17
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-211-13/+47
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-201-1/+2
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2026-500/+498
|\| |
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-202-154/+36
| |/
| * Remove on click on iconDominik Schürmann2015-03-191-0/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-192-45/+81
| |\
| | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-191-40/+51
| * | Manage my keys wizardDominik Schürmann2015-03-1911-263/+323
| |/
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1917-65/+81
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-205-89/+37
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-195-43/+54
* | yubikey certifications!Vincent Breitmoser2015-03-183-62/+117
* | generalize nfc crypto input structureVincent Breitmoser2015-03-184-24/+519
* | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-181-1/+3
|/
* File extensions into ConstantsDominik Schürmann2015-03-174-13/+15
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-8/+36
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-164-6/+27
* object oriented split user idDominik Schürmann2015-03-1620-88/+84
* Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
* Clarify MIME usageDominik Schürmann2015-03-152-2/+2
* Remove display of key id in other listsDominik Schürmann2015-03-153-18/+65
* Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
* Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
* Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
|\
| * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
* | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-151-1/+3
|\ \
| * | -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-151-1/+3
* | | Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-153-14/+37
* | | Query for duplicate user idsDominik Schürmann2015-03-151-1/+4
|/ /
* | added some documentationAdithya Abraham Philip2015-03-131-4/+5
* | added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-7/+25
* | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
* | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
* | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
|\ \
| * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
* | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1215-24/+27
|\ \ \
| * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-094-29/+32
| |\| |
| * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0915-24/+27
* | | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+3
* | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-123-46/+104
|\ \ \ \