aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-32/+393
|\
| * Reworked Notify classManoj Khanna2015-03-201-5/+4
| * Fix API RESULT_TYPEDominik Schürmann2015-03-201-1/+2
| * Updated GNU headerKent2015-03-201-1/+2
| * Removed create and added GPLv3 headerKent2015-03-201-4/+17
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-201-0/+204
| * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-191-15/+0
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| * Fix tests for Passphrase classDominik Schürmann2015-03-191-0/+4
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-0/+131
| * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| * object oriented split user idDominik Schürmann2015-03-161-11/+10
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-37/+261
|\|
| * Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-151-10/+12
| |\
| | * -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-151-10/+12
| * | Use names also for main contactDominik Schürmann2015-03-141-3/+3
| * | Show key name instead of key id in contacts, cleanupDominik Schürmann2015-03-141-20/+7
| |/
| * added some documentationAdithya Abraham Philip2015-03-131-23/+82
| * added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-3/+36
| * links own keys to me profile in contactsAdithya Abraham Philip2015-03-131-9/+118
| * Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-121-1/+1
| |\
| | * Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| * | corrected linked system contact display nameAdithya Abraham Philip2015-03-111-3/+37
* | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-6/+48
|\| |
| * | RippleDominik Schürmann2015-03-101-3/+1
| * | added CALLER_IS_SYNCADAPTER parameter to delete queriesAdithya Abraham Philip2015-03-101-3/+47
| |/
* / filter out unknown linked idsVincent Breitmoser2015-03-101-0/+76
|/
* Remove dublicate email checkDominik Schürmann2015-03-061-3/+1
* Improve way of getting possible names by filtering out emailsDominik Schürmann2015-03-061-1/+25
* Remove advanced preferences, move compression as menu item in encrypt activit...Dominik Schürmann2015-03-051-91/+0
* Remove preferences multi process min sdk checkDominik Schürmann2015-03-051-6/+2
* Debug optionsDominik Schürmann2015-03-051-1/+3
* Better selection of preferred algorithmDominik Schürmann2015-03-051-1/+9
* Simplified language: Confirm keysDominik Schürmann2015-03-041-2/+4
* Get high res version of contact photoDominik Schürmann2015-03-041-4/+5
* ContactHelper cleanupDominik Schürmann2015-03-041-32/+40
* Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-041-86/+104
* Cleanup of contact sync, debuggingDominik Schürmann2015-03-031-80/+110
* Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
* forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
* Disable default yubikey PIN by defaultDominik Schürmann2015-02-221-1/+1
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-013-2/+13
* prevent recursive consolidateVincent Breitmoser2015-01-311-1/+0
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-3/+3
|\
* | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-2511-64/+35
* | Disable sharing chooser blacklisting for lollipopDominik Schürmann2015-01-191-2/+4
|/
* Yubikey numkey by default to trueDominik Schürmann2015-01-141-1/+1
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-3/+4
* Minor code cleanupDominik Schürmann2014-11-211-8/+8
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-261-0/+6