aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* corrected possible null pointerAdithya Abraham Philip2015-04-221-1/+1
* Simplify ImportKeysProxyActivityDominik Schürmann2015-04-211-29/+12
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-218-52/+192
|\
| * added log to QR code scan/import failAdithya Abraham Philip2015-04-211-12/+11
| * Fix for initialization failure when card returns FCI in data field.Joey Castillo2015-04-201-1/+1
| * Track state of PIN verification on smart card; only verify when needed.Joey Castillo2015-04-201-2/+33
| * support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-206-37/+147
* | Cleanup in HkpKeyserverDominik Schürmann2015-04-201-4/+3
|/
* Format KeyListFragmentDominik Schürmann2015-04-181-10/+9
* Temporarily fix devices without nfcDominik Schürmann2015-04-181-0/+6
* Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
* More cleanupDominik Schürmann2015-04-159-324/+28
* Fix YubiKey naming, cleanupDominik Schürmann2015-04-1510-62/+54
* Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
* Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
* Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
* Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
* Reformat comment in PassphraseCacheServiceDominik Schürmann2015-04-131-4/+5
* Buffer ascii armored encryption/signaturesDominik Schürmann2015-04-132-3/+4
* Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-132-39/+118
|\
| * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-082-12/+24
| * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-082-38/+105
* | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-136-100/+321
* | Clearer var namingDominik Schürmann2015-04-121-8/+8
* | More simplifications to PassphraseCacheServiceDominik Schürmann2015-04-121-27/+21
* | Simplify PassphraseCacheServiceDominik Schürmann2015-04-121-16/+12
* | 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-0114-267/+138
* | 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