aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
...
| * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-082-38/+105
| |
* | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-137-100/+325
| |
* | 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
| |
* | Switch to html-textview from JCenterDominik Schürmann2015-04-121-2/+2
| |
* | 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
| |
* | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| |
* | 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
| | |
* | | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| | |
* | | Simplify passphrase dialog designDominik Schürmann2015-03-313-4/+4
|/ /
* | update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-301-0/+13
| |
* | Merge branch 'v/crypto-input-parcel' of ↵Vincent Breitmoser2015-03-309-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 spinnerDominik Schürmann2015-03-301-0/+2
| | |
| * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | |
| * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-308-184/+390
| | |
* | | remove unused NfcActivityVincent Breitmoser2015-03-303-580/+5
| | |
* | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3021-560/+185
| | |
* | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-3010-90/+35
|/ /
* | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵Dominik Schürmann2015-03-301-4/+4
| | | | | | | | git submodules
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-307-405/+423
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-405/+423
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
* | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| |
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-293-14/+42
|\|
| * 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-272-12/+37
| |/ | | | | | | 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-298-43/+70
| |
* | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
| |
* | Refactoring of EncryptTextActivityDominik Schürmann2015-03-279-404/+418
| |
* | 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-269-516/+539
| |
* | 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-24225-8095/+10159
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * 3.2beta3Dominik Schürmann2015-03-232-3/+3
| |
| * translation fixesDominik Schürmann2015-03-238-113/+93
| |
| * Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| |