aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact
| * 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 ↵Dominik Schürmann2015-04-042-6/+7
| | | | | | | | when adding a range of input uris
* | 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 ↵Dominik Schürmann2015-03-314-12/+50
|\ \ | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel
| * | 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 ↵Vincent Breitmoser2015-03-306-120/+332
|\ \ | | | | | | | | | | | | | | | | | | 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 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
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
* | 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
| |\ | | | | | | Corrected import error message, changed style to WARN
| | * 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
| |/ | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
* | 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 ↵iseki2015-03-261-26/+33
| | | | | | | | showMultiExportDialog.
| * 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
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * 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: NullPointerException when signing with YubiKey
| | * Fixed #1152:Kent2015-03-201-5/+11
| | | | | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding.
| * | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2322-122/+681
| |\ \ | | | | | | | | Multi-threaded key import, update all feature
| | * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2320-334/+608
| | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * | introduced multi-threadingAdithya Abraham Philip2015-03-234-35/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor