aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-104-24/+69
* Remove unused AlgorithmNamesDominik Schürmann2015-04-101-93/+0
* Add license headersDominik Schürmann2015-04-103-0/+51
* Externalize Parcelable cachingDominik Schürmann2015-04-102-59/+106
* Fix signing subkey selection in remote serviceDominik Schürmann2015-04-072-20/+52
* Fix nullpointer with Intent API, fix clearing of encrypt file list, notify wh...Dominik Schürmann2015-04-042-6/+7
* fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-0115-276/+150
* Prepare decrypt UI for input parcelDominik Schürmann2015-03-313-129/+79
* Better check if file is already addedDominik Schürmann2015-03-311-19/+42
* Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Dominik Schürmann2015-03-314-12/+50
|\
| * work on passphrase data flowVincent Breitmoser2015-03-314-12/+50
* | Simplify passphrase dialog designDominik Schürmann2015-03-311-2/+3
|/
* update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-301-0/+13
* Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-306-120/+332
|\
| * Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| * Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-305-121/+331
* | remove unused NfcActivityVincent Breitmoser2015-03-302-574/+5
* | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3020-559/+185
* | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-3010-90/+35
|/
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-304-392/+400
|\
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-292-14/+41
|\|
| * Merge pull request #1188 from adithyaphilip/import-message-errorDominik Schürmann2015-03-281-2/+5
| |\
| | * changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| * | -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-12/+36
| |/
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-295-41/+69
* | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
* | Refactoring of EncryptTextActivityDominik Schürmann2015-03-278-400/+415
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-261-14/+76
|\|
| * Modify break as return.iseki2015-03-261-1/+1
| * Add brackets for if-else constructs and externalize the procedure as showMult...iseki2015-03-261-26/+33
| * Add a loop for multiple key export.iseki2015-03-251-13/+68
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-266-506/+531
* | Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
* | Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-2432-186/+753
|\|
| * Pull from transifexDominik Schürmann2015-03-233-10/+10
| * Merge pull request #1165 from kentnek/dev-yubikey-nullDominik Schürmann2015-03-231-5/+11
| |\
| | * Fixed #1152:Kent2015-03-201-5/+11
| * | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2322-122/+681
| |\ \
| | * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2320-334/+608
| | * | introduced multi-threadingAdithya Abraham Philip2015-03-234-35/+320
| * | | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
| * | | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fixed issue where setting a passphrase to null later causes a NullPointerExce...JesperBK2015-03-231-1/+3
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-03-231-14/+23
| |\ \ \
| * | | | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
| | |/ / | |/| |
* | | | further improve yubikey error handlingVincent Breitmoser2015-03-234-24/+77
* | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
* | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
|\ \ \ \ | | |/ / | |/| |