Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Update openpgp-api lib | Dominik Schürmann | 2015-05-06 | 1 | -0/+0 | |
|/ | ||||||
* | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 2 | -62/+80 | |
| | ||||||
* | Rename for consistency | Dominik Schürmann | 2015-05-06 | 2 | -5/+4 | |
| | ||||||
* | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 2 | -11/+10 | |
| | ||||||
* | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 5 | -117/+181 | |
| | | | | in DecryptTextActivity | |||||
* | Remove reference to deleted API Demo | Dominik Schürmann | 2015-05-06 | 1 | -6/+0 | |
| | ||||||
* | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 11 | -11/+12 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-05 | 3 | -9/+54 | |
|\ | | | | | | | development | |||||
| * | Merge pull request #1235 from wfaulk/replacement_extra | Dominik Schürmann | 2015-05-04 | 3 | -9/+54 | |
| |\ | | | | | | | Fix Bluetooth share without breaking others | |||||
| | * | revert unneeded changes for short key ID | William Faulk | 2015-05-04 | 1 | -27/+3 | |
| | | | ||||||
| | * | revert unneeded changes for old temp Bluetooth share file | William Faulk | 2015-05-04 | 1 | -13/+0 | |
| | | | ||||||
| | * | use single file extension | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 2 | -32/+18 | |
| | | | ||||||
| | * | Use FILE_EXTENSION constants | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | Use primary user ID for filename instead of short key ID | William Faulk | 2015-05-04 | 1 | -2/+5 | |
| | | | ||||||
| | * | Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater | William Faulk | 2015-05-04 | 1 | -42/+44 | |
| | | | ||||||
| | * | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 4 | -9/+100 | |
| |/ | ||||||
* | | Cleanup manifest | Dominik Schürmann | 2015-05-05 | 1 | -15/+16 | |
| | | ||||||
* | | Fix nullpointer in file decryption | Dominik Schürmann | 2015-05-05 | 1 | -1/+1 | |
|/ | ||||||
* | Fix revoked/expired state in decrypt activity | Dominik Schürmann | 2015-05-04 | 4 | -37/+27 | |
| | ||||||
* | Fix cancel/skip in create key wizard | Dominik Schürmann | 2015-05-04 | 3 | -52/+35 | |
| | ||||||
* | Display notify above keyboard in CreateKeyEmailFragment | Dominik Schürmann | 2015-05-04 | 1 | -2/+2 | |
| | ||||||
* | Fix email pattern | Dominik Schürmann | 2015-05-04 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'Hiperzone-development' into development | Dominik Schürmann | 2015-05-04 | 3 | -50/+94 | |
|\ | ||||||
| * | Use more simple email validation regex | Dominik Schürmann | 2015-05-04 | 1 | -7/+8 | |
| | | ||||||
| * | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 3 | -51/+94 | |
|/| | | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java | |||||
| * | -removed unneeded inputType attribute from xml files (+1 squashed commits) | Daniel Ramos | 2015-04-30 | 3 | -12/+10 | |
| | | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing | |||||
| * | -Removed unneeded view references from the fragment class since they are not ↵ | Daniel Ramos | 2015-04-26 | 1 | -7/+3 | |
| | | | | | | | | | | | | used outside of createView. -cleanup | |||||
| * | -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵ | Daniel Ramos | 2015-04-26 | 1 | -3/+0 | |
| | | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected. | |||||
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Daniel Ramos | 2015-04-26 | 43 | -462/+791 | |
| |\ | | | | | | | | | | into development | |||||
| * \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 5 | -44/+92 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |||||
| | * \ | Merge branch 'feature/emailImprovements' into localdev | Daniel Ramos | 2015-04-24 | 6 | -45/+97 | |
| | |\ \ | ||||||
| | | * | | -Fixed a crash while recreating CreateKeyEmailFragment | Daniel Ramos | 2015-04-24 | 1 | -16/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | -Email data is properly restored while rotating the Activity. -Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email. | |||||
| | | * | | -Improved email sanity verifications when adding emails when creating a new Key | Daniel Ramos | 2015-04-14 | 6 | -30/+82 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment. | |||||
* | | | | Merge branch 'manojkhannakm-development' into development | Dominik Schürmann | 2015-05-04 | 4 | -2/+288 | |
|\ \ \ \ | ||||||
| * | | | | Temporary fix for gradle dependency bug | Dominik Schürmann | 2015-05-04 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | Fix dublicated code in CreateKeyEmailFragment | Dominik Schürmann | 2015-05-04 | 1 | -4/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 4 | -2/+286 | |
|/| | | | | | | | | | | | | | | | | | | | into manojkhannakm-development | |||||
| * | | | | Espresso test for CreateKeyActivity | Manoj Khanna | 2015-04-25 | 4 | -5/+286 | |
| | | | | | ||||||
* | | | | | license header for PgpCertifyOperation | Dominik Schürmann | 2015-05-04 | 1 | -1/+19 | |
| | | | | | ||||||
* | | | | | Apply patch from ↵ | Dominik Schürmann | 2015-05-04 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 | |||||
* | | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 ↵ | Dominik Schürmann | 2015-05-04 | 1 | -8/+22 | |
| | | | | | | | | | | | | | | | | | | | | with db upgrade | |||||
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-04 | 1 | -1/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | development | |||||
| * \ \ \ \ | Merge pull request #1238 from wfaulk/fix-tests | Dominik Schürmann | 2015-05-04 | 1 | -1/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | updated robolectric to support new android support libs | |||||
| | * | | | | | updated robolectric to support new android support libs | William Faulk | 2015-05-03 | 1 | -1/+2 | |
| |/ / / / / | ||||||
* / / / / / | Fix yubikey strings | Dominik Schürmann | 2015-05-01 | 2 | -7/+7 | |
|/ / / / / | ||||||
* | | | | | More nullpointer fixes | Dominik Schürmann | 2015-05-01 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix nullpointer in EncryptKeyCompletionView | Dominik Schürmann | 2015-05-01 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Remove time from key creation display | Dominik Schürmann | 2015-04-30 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | Fix key creation string and display | Dominik Schürmann | 2015-04-30 | 4 | -27/+13 | |
| | | | | |