aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | modifyKey: couple more fixes from testsVincent Breitmoser2014-07-112-4/+34
| * | | | some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-113-18/+67
| * | | | modifyKey: preserve master key flagsVincent Breitmoser2014-07-111-5/+22
| * | | | add come createKey stringsVincent Breitmoser2014-07-112-2/+11
| * | | | tests: add testSubkeyAddVincent Breitmoser2014-07-102-0/+5
| * | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads...Vincent Breitmoser2014-07-098-830/+1
| |\ \ \ \
| | * | | | actually provide a tostringArt O Cathain2014-07-071-1/+1
| | * | | | prevent odd ambiguous method toString errorArt O Cathain2014-07-071-1/+1
| | * | | | (c) headers, tidy importsArt O Cathain2014-07-076-7/+100
| | * | | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
| | * | | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | * | | | Actually test canonicalizeArt O Cathain2014-07-062-75/+160
| | * | | | data fixesArt O Cathain2014-07-061-13/+14
| | * | | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | * | | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| | * | | | work in progressArt O Cathain2014-07-063-1/+511
| * | | | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-071-1/+1
| * | | | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| * | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-074-1/+530
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | * | | | actually canonicalizeArt O Cathain2014-07-061-1/+10
| | * | | | work in progressArt O Cathain2014-07-063-1/+511
| | | |_|/ | | |/| |
* | | | | Final Commit for #662Daniel Albert2014-07-161-1/+6
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-133-8/+223
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-123-16/+151
| |\ \ \ \
| | * | | | Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| * | | | | more work on edit keyDominik Schürmann2014-07-122-7/+222
| | |_|_|/ | |/| | |
* | | | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-123-0/+28
| |/ / / |/| | |
* | | | Fixed issues discussed in #713Daniel Albert2014-07-122-12/+12
* | | | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-6/+6
* | | | Added Purging for Android < 4.1Daniel Albert2014-07-121-28/+51
* | | | Implemented Notification, no fallback yetDaniel Albert2014-07-123-7/+83
* | | | new PassphraseCache, storing UserIDs as wellDaniel Albert2014-07-121-11/+47
|/ / /
* | | Fix OperationResultParcelmar-v-in2014-07-091-8/+8
* | | Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
|\| |
| * | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
| |/
* / Work on subkeys adapterDominik Schürmann2014-07-084-52/+246
|/
* Use strings in edit keyDominik Schürmann2014-07-031-3/+4
* Remove old edit button, rename activitiesDominik Schürmann2014-07-036-801/+780
* cleanup, debug for passphrase setDominik Schürmann2014-07-031-5/+4
* fix no passphrase checkDominik Schürmann2014-07-031-1/+3
* Cache passphrase for editDominik Schürmann2014-07-031-2/+2
* Cache passphrase for editDominik Schürmann2014-07-033-30/+60
* parcel newPassphraseDominik Schürmann2014-07-031-0/+4
* cleanupDominik Schürmann2014-07-032-0/+5
* edit key: subkey adapterDominik Schürmann2014-07-032-1/+361
* Work on editDominik Schürmann2014-07-035-48/+66
* smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
* Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2