Dominik Schürmann
b332aacabb
Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master
...
Conflicts:
OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
2014-07-18 09:49:20 +02:00
Daniel Albert
db002bde7c
Fixed another unescaped apostrophe.
2014-07-17 21:17:39 +02:00
Daniel Albert
8a8d8c5a68
Fixed unescaped apostrophe
2014-07-17 20:53:10 +02:00
Daniel Albert
01046fc0e7
Added description to Setting, Changed title to suggested one
2014-07-17 20:01:53 +02:00
Daniel Albert
d63534d655
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
2014-07-16 18:49:16 +02:00
Daniel Albert
e375cde7e1
Final Commit for #662
2014-07-16 18:17:46 +02:00
Dominik Schürmann
82af9672fd
Temporary program flow fixes
2014-07-16 10:07:50 +02:00
Dominik Schürmann
77d04a915b
Simple create key
2014-07-16 10:05:00 +02:00
Dominik Schürmann
57f5a788fd
Simple create key
2014-07-16 10:04:48 +02:00
Dominik Schürmann
c1c831e52b
New first time screen
2014-07-16 09:49:37 +02:00
Dominik Schürmann
d3c54d5f12
Fallback if no primary user id exists
2014-07-16 00:22:45 +02:00
Vincent Breitmoser
64b87f75be
move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)
2014-07-15 19:47:52 +02:00
Dominik Schürmann
848043a481
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-15 19:34:01 +02:00
Vincent Breitmoser
501d4b887a
signatures: a revocation reason does NOT determine if a cert is a revocation type
2014-07-15 19:31:27 +02:00
Dominik Schürmann
503b146a14
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-15 19:22:44 +02:00
Dominik Schürmann
72237a0892
some fixes for edit
2014-07-15 19:22:40 +02:00
Vincent Breitmoser
29145e49c9
merge: different msg if nothing was merged
2014-07-15 19:17:08 +02:00
Vincent Breitmoser
858fe47d46
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-07-15 17:39:36 +02:00
Daniel Albert
c101ee0240
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
2014-07-13 15:39:16 +02:00
Dominik Schürmann
0ce9c13132
Fix strings from 'keys' to 'passphrases'
2014-07-12 21:07:29 +02:00
Dominik Schürmann
af5fddab7c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-12 21:04:57 +02:00
Dominik Schürmann
45dfb39749
more work on edit key
2014-07-12 20:39:23 +02:00
Daniel Albert
bd909375c2
Fixed misplaced bracket
2014-07-12 19:24:51 +02:00
Daniel Albert
92c66743e0
Added Preference for concealing the PgpApplication
2014-07-12 19:19:12 +02:00
Daniel Albert
066591dab1
Wello there, That's Java, not C^^
2014-07-12 18:53:52 +02:00
Daniel Albert
079194abe5
Fixed issues discussed in #713
2014-07-12 18:12:03 +02:00
Daniel Albert
7a3fe61a1f
Put text into strings.xml, for internationalization
2014-07-12 12:52:44 +02:00
Daniel Albert
2568ea4b2e
Added Purging for Android < 4.1
2014-07-12 12:42:48 +02:00
Daniel Albert
cf40517eac
Implemented Notification, no fallback yet
2014-07-12 12:27:19 +02:00
Daniel Albert
af90db96a5
new PassphraseCache, storing UserIDs as well
2014-07-12 10:51:12 +02:00
Vincent Breitmoser
f82093c666
modifyKey: error out on integrity check fails
2014-07-12 02:02:37 +02:00
Vincent Breitmoser
0e3327c65c
createKey: better logging, handle empty user id case
2014-07-12 01:29:06 +02:00
Vincent Breitmoser
54bc874ce5
Merge remote-tracking branch 'origin/master' into external-test
...
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
2014-07-11 21:00:26 +02:00
Vincent Breitmoser
faa8c2baa3
travis: get rid of lint
2014-07-11 16:39:31 +02:00
Vincent Breitmoser
20b28b5207
modifyKey: proper expiry check during SubkeyAdd
2014-07-11 15:42:02 +02:00
Vincent Breitmoser
7b195ac2e3
modifyKey: make SubkeyChange operations work
2014-07-11 15:20:16 +02:00
Vincent Breitmoser
1436ab8d90
SaveKeyringParcel: follow attribute m prefix coding guideline
2014-07-11 13:51:36 +02:00
Vincent Breitmoser
bb92fe2804
test: get rid of some SaveKeyringParcel boilerplate
2014-07-11 13:49:17 +02:00
Vincent Breitmoser
26f6d58284
get rid of some inspection warnings
2014-07-11 13:45:06 +02:00
Vincent Breitmoser
4da273ac16
modifyKey: error out on nonexisting new primary user id
2014-07-11 13:35:48 +02:00
Vincent Breitmoser
d6f3b4b879
fix bug in canonicalization regarding subkey revocation
2014-07-11 03:27:44 +02:00
Vincent Breitmoser
f6e39b0a97
modifyKey: couple more fixes from tests
2014-07-11 02:51:13 +02:00
Vincent Breitmoser
e477577c55
some UncachedKeyRing fixes, primary user id mostly
2014-07-11 02:50:35 +02:00
Vincent Breitmoser
38ee6203ad
modifyKey: preserve master key flags
2014-07-11 02:49:51 +02:00
Vincent Breitmoser
dce2df4113
add come createKey strings
2014-07-11 02:48:54 +02:00
Vincent Breitmoser
90f546a4e8
tests: add testSubkeyAdd
2014-07-10 01:38:57 +02:00
Vincent Breitmoser
a9c3d6b507
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
2014-07-09 16:39:26 +02:00
Vincent Breitmoser
718acbf954
put unit tests into external module (CAVEAT)
...
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.
2014-07-09 16:03:30 +02:00
mar-v-in
5185492b04
Fix OperationResultParcel
...
Naming conventions save lives... or atleast make addAll() work
2014-07-09 00:10:09 +02:00
Dominik Schürmann
16498be4a2
Fix nullpointer in API, fix #693
2014-07-08 04:24:27 +02:00
