aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1650-1294/+865
|\ | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * Temporary program flow fixesDominik Schürmann2014-07-161-0/+3
| |
| * Simple create keyDominik Schürmann2014-07-161-1/+0
| |
| * Simple create keyDominik Schürmann2014-07-163-51/+57
| |
| * New first time screenDominik Schürmann2014-07-1615-681/+362
| |
| * Fallback if no primary user id existsDominik Schürmann2014-07-1611-13/+34
| |
| * move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-159-22/+21
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
| |\
| | * signatures: a revocation reason does NOT determine if a cert is a revocation ↵Vincent Breitmoser2014-07-151-1/+1
| | | | | | | | | | | | type
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-154-3/+9
| |\|
| | * merge: different msg if nothing was mergedVincent Breitmoser2014-07-154-3/+9
| | |
| * | some fixes for editDominik Schürmann2014-07-152-4/+5
| |/
| * 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
| * | 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
| * | | 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-079-7/+151
| | | | |
| | * | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-072-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
| | * | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | | | |
| | * | | Actually test canonicalizeArt O Cathain2014-07-063-87/+181
| | | | |
| | * | | add the GPG versionArt O Cathain2014-07-062-1/+10
| | | | |
| | * | | data fixesArt O Cathain2014-07-062-13/+18
| | | | |
| | * | | add toString for test easeArt O Cathain2014-07-061-0/+10
| | | | |
| | * | | actually canonicalizeArt O Cathain2014-07-062-5/+11
| | | | |
| | * | | work in progressArt O Cathain2014-07-064-1/+548
| | | | |
| * | | | put unit tests into external module (CAVEAT)Vincent Breitmoser2014-07-097-225/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this requires a more up to date version of gradle-android-test-plugin than is currently in the repositories. it must be added to the local maven repo using ./install-custom-gradle-test-plugin.sh before compiling.
| * | | | use KeyringTestHelper.diffKeyrings method for unit testVincent Breitmoser2014-07-072-2/+19
| | | | |
| * | | | add diffKeyrings methodVincent Breitmoser2014-07-071-0/+133
| | | | |
| * | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-075-1/+564
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 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-062-5/+11
| | | | |
| | * | | work in progressArt O Cathain2014-07-064-1/+548
| | | | |
* | | | | Final Commit for #662Daniel Albert2014-07-161-1/+6
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master' into feature-conceal-softwareDaniel Albert2014-07-134-10/+225
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix strings from 'keys' to 'passphrases'Dominik Schürmann2014-07-121-2/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 08:45:57 +0000