aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* fix transition animationVincent Breitmoser2015-03-093-9/+41
|
* use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-099-110/+275
|
* successfully certify linked idsVincent Breitmoser2015-03-085-21/+81
|
* return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-084-7/+5
|
* minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-083-11/+11
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0852-615/+1264
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * add support for certification of user attributesVincent Breitmoser2015-03-085-19/+102
| |
| * Merge pull request #1108 from tdjogi010/developmentVincent2015-03-061-38/+74
| |\ | | | | | | Asks Passphrase for key delete/export in ViewKeyActivity.
| | * Asks Passphrase for key delete/export in ViewKeyActivity.tdjogi010@gmail.com2015-03-061-38/+74
| | |
| * | Added GPLv3 Licensechipset952015-03-062-0/+34
| | |
| * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-068-101/+215
| | |
| * | Format code of merged password strength widgetDominik Schürmann2015-03-052-40/+49
| | |
| * | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-056-8/+536
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| | * | Integrates passphrase strength indicator to create key wizard.Lukas Zorich2015-03-032-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit patches issue #1050. The padding set in the passphrase edit text is set programmatically because there is a bug in appcompat-v7 where padding via xml doesn't work: http://code.google.com/p/android/issues/detail?id=77982
| | * | Add license to password strength view classesLukas Zorich2015-03-034-1/+80
| | | |
| | * | Implemented Matt Allen password strength indicatorLukas Zorich2015-03-033-0/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml.
| * | | Use ArrayList instead of LinkedListDominik Schürmann2015-03-055-11/+13
| | | |
| * | | Cleanup of PgpConstantsDominik Schürmann2015-03-051-24/+22
| | | |
| * | | Add missing headerDominik Schürmann2015-03-051-0/+17
| | | |
| * | | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-053-0/+34
| | | |
| * | | Use static linked lists instead of arraysDominik Schürmann2015-03-056-35/+53
| | | |
| * | | Add missing file with PGP ConstantsDominik Schürmann2015-03-051-0/+69
| | | |
| * | | Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-0519-484/+134
| | | | | | | | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists
| * | | Remove preferences multi process min sdk checkDominik Schürmann2015-03-051-6/+2
| | | |
| * | | Remove false comment in list fragmentDominik Schürmann2015-03-051-3/+0
| | | |
| * | | Debug optionsDominik Schürmann2015-03-053-2/+6
| | | |
| * | | Design fixes for decryption screenDominik Schürmann2015-03-0513-3/+3
| | | |
| * | | Use no compression in API for nowDominik Schürmann2015-03-051-1/+2
| | | |
| * | | Better selection of preferred algorithmDominik Schürmann2015-03-0511-40/+99
| | | |
* | | | work on certification stepVincent Breitmoser2015-03-082-7/+100
| | | |
* | | | finish after linked id creationVincent Breitmoser2015-03-061-12/+1
| | | |
* | | | use final fragment superclass for twitterVincent Breitmoser2015-03-061-98/+23
| | | |
* | | | use final fragment superclass for dnsVincent Breitmoser2015-03-062-214/+19
| | | |
* | | | extract linked id create final fragment superclassVincent Breitmoser2015-03-062-221/+275
| | | |
* | | | prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-065-34/+42
| | | |
* | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-068-237/+410
| | | |
* | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-0512-105/+178
| | | |
* | | | make linked identity list homogeneousVincent Breitmoser2015-03-0512-112/+156
| | | |
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-05525-1403/+1150
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-0413-70/+85
| |\ \ \ | | | | | | | | | | #1042 replaced some int constants with enums
| | * | | #1042 replaced some int constants with enumsDaniel Nelz2015-03-0413-70/+85
| | | | | | | | | | | | | | | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
| * | | | Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
| | | | |
| * | | | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| | | | |
| * | | | Use material save iconDominik Schürmann2015-03-0410-1/+1
| | | | |
| * | | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-048-2/+225
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * | | | corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| | | | | |
| | * | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-023-9/+23
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into development
| | * | | | | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| | | | | | |
| | * | | | | added logging, notify for log exportAdithya Abraham Philip2015-03-013-20/+66
| | | | | | |
| | * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-284-37/+113
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into development