Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Consolidate PIN verify operation in nfcVerifyPIN method. | Joey Castillo | 2015-04-14 | 1 | -44/+28 | |
| | | | ||||||
| * | | Move PIN verify inside sign/decrypt operation and set correct mode. | Joey Castillo | 2015-04-14 | 1 | -19/+45 | |
| | | | ||||||
* | | | Contribution info | Dominik Schürmann | 2015-04-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Contribution info | Dominik Schürmann | 2015-04-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Remove unused includes in settings.gradle | Dominik Schürmann | 2015-04-14 | 1 | -2/+0 | |
|/ / | ||||||
* / | Update libs | Dominik Schürmann | 2015-04-14 | 1 | -6/+6 | |
|/ | ||||||
* | Pull from transifex | Dominik Schürmann | 2015-04-14 | 110 | -1110/+1555 | |
| | ||||||
* | Update html-textview, fix build | Dominik Schürmann | 2015-04-14 | 1 | -2/+2 | |
| | ||||||
* | Reformat comment in PassphraseCacheService | Dominik Schürmann | 2015-04-13 | 1 | -4/+5 | |
| | ||||||
* | Buffer ascii armored encryption/signatures | Dominik Schürmann | 2015-04-13 | 2 | -3/+4 | |
| | ||||||
* | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 3 | -39/+119 | |
|\ | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact | |||||
| * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 3 | -12/+25 | |
| | | ||||||
| * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 2 | -38/+105 | |
| | | ||||||
* | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 7 | -100/+325 | |
| | | ||||||
* | | Clearer var naming | Dominik Schürmann | 2015-04-12 | 1 | -8/+8 | |
| | | ||||||
* | | More simplifications to PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -27/+21 | |
| | | ||||||
* | | Simplify PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -16/+12 | |
| | | ||||||
* | | Remove html-textview reference from settings.gradle | Dominik Schürmann | 2015-04-12 | 1 | -1/+0 | |
| | | ||||||
* | | Switch to html-textview from JCenter | Dominik Schürmann | 2015-04-12 | 3 | -6/+2 | |
| | | ||||||
* | | Update api lib | Dominik Schürmann | 2015-04-10 | 1 | -0/+0 | |
| | | ||||||
* | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 4 | -24/+69 | |
| | | ||||||
* | | Remove unused AlgorithmNames | Dominik Schürmann | 2015-04-10 | 1 | -93/+0 | |
| | | ||||||
* | | Add license headers | Dominik Schürmann | 2015-04-10 | 3 | -0/+51 | |
| | | ||||||
* | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 2 | -59/+106 | |
| | | ||||||
* | | Fix signing subkey selection in remote service | Dominik Schürmann | 2015-04-07 | 2 | -20/+52 | |
| | | ||||||
* | | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify ↵ | Dominik Schürmann | 2015-04-04 | 2 | -6/+7 | |
| | | | | | | | | when adding a range of input uris | |||||
* | | fix PgpEncryptDecryptTest for CryptoInputParcel | Vincent Breitmoser | 2015-04-01 | 1 | -26/+22 | |
| | | ||||||
* | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 15 | -276/+150 | |
| | | ||||||
* | | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 3 | -129/+79 | |
| | | ||||||
* | | Rename advanced to extended | Dominik Schürmann | 2015-03-31 | 1 | -7/+7 | |
| | | ||||||
* | | Better check if file is already added | Dominik Schürmann | 2015-03-31 | 1 | -19/+42 | |
| | | ||||||
* | | Merge branch 'v/crypto-input-parcel' of ↵ | Dominik Schürmann | 2015-03-31 | 4 | -12/+50 | |
|\ \ | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel | |||||
| * | | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 4 | -12/+50 | |
| | | | ||||||
* | | | From passphrase to password | Dominik Schürmann | 2015-03-31 | 1 | -47/+47 | |
| | | | ||||||
* | | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 3 | -4/+4 | |
|/ / | ||||||
* | | update OpenPgpApi, re-add EXTRA_PASSPHRASE | Vincent Breitmoser | 2015-03-30 | 2 | -0/+13 | |
| | | ||||||
* | | Merge branch 'v/crypto-input-parcel' of ↵ | Vincent Breitmoser | 2015-03-30 | 9 | -183/+392 | |
|\ \ | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | |||||
| * | | Dont show slinger button in spinner | Dominik Schürmann | 2015-03-30 | 1 | -0/+2 | |
| | | | ||||||
| * | | Fix scrollbar | Dominik Schürmann | 2015-03-30 | 1 | -0/+1 | |
| | | | ||||||
| * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 8 | -184/+390 | |
| | | | ||||||
* | | | remove unused NfcActivity | Vincent Breitmoser | 2015-03-30 | 3 | -580/+5 | |
| | | | ||||||
* | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 21 | -560/+185 | |
| | | | ||||||
* | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 10 | -90/+35 | |
|/ / | ||||||
* | | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵ | Dominik Schürmann | 2015-03-30 | 4 | -12/+4 | |
| | | | | | | | | git submodules | |||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 7 | -405/+423 | |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java | |||||
| * | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 7 | -405/+423 | |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | |||||
* | | Fix strings with email address | Dominik Schürmann | 2015-03-29 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 3 | -14/+42 | |
|\| | ||||||
| * | Merge pull request #1188 from adithyaphilip/import-message-error | Dominik Schürmann | 2015-03-28 | 1 | -2/+5 | |
| |\ | | | | | | | Corrected import error message, changed style to WARN | |||||
| | * | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
| | | |