aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-156-23/+380
|\ | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-124-16/+158
| |\
| | * Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| | |
| | * Wello there, That's Java, not C^^Daniel Albert2014-07-121-1/+1
| | |
| | * Fixed issues discussed in #713Daniel Albert2014-07-123-14/+15
| | |
| | * Put text into strings.xml, for internationalizationDaniel Albert2014-07-122-6/+12
| | |
| | * 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
| | |
| * | more work on edit keyDominik Schürmann2014-07-122-7/+222
| |/
* | modifyKey: error out on integrity check failsVincent Breitmoser2014-07-122-10/+18
| |
* | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-123-44/+66
| |
* | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-119-76/+296
|\| | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| * Fix OperationResultParcelmar-v-in2014-07-091-8/+8
| | | | | | Naming conventions save lives... or atleast make addAll() work
| * Fix nullpointer in API, fix #693Dominik Schürmann2014-07-081-1/+7
| |
| * cleanupDominik Schürmann2014-07-081-30/+0
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-082-6/+27
| |\
| * | Work on subkeys adapterDominik Schürmann2014-07-088-66/+310
| | |
* | | modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
| | |
* | | modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-114-27/+64
| | |
* | | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-118-69/+66
| | |
* | | test: get rid of some SaveKeyringParcel boilerplateVincent Breitmoser2014-07-111-5/+11
| | |
* | | get rid of some inspection warningsVincent Breitmoser2014-07-113-5/+2
| | |
* | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-113-0/+12
| | |
* | | fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
| | |
* | | 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-113-3/+19
| | |
* | | tests: add testSubkeyAddVincent Breitmoser2014-07-102-0/+5
| | |
* | | Merge remote-tracking branch ↵Vincent Breitmoser2014-07-098-830/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
| * | | 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
| | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
| * | | 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
|\ \ \ | |/ / |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
| * | 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
| |/
* / Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-062-6/+27
|/
* Bett API stringDominik Schürmann2014-07-041-3/+3
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 12:58:31 +0000