moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-18 05:12:16 -05:00
Code Issues Releases Wiki Activity
2,285 Commits 12 Branches 24 Tags 116 MiB
a99589e9c4
Commit Graph

544 Commits

Author SHA1 Message Date
mar-v-in
f55bc41682 Use Document API on KitKat for file encrypt/decrypt 2014-06-10 20:57:48 +02:00
Vincent Breitmoser
3895c10a58 import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
Vincent Breitmoser
f38556cab1 import-log: switch to flags instead of statuses for result int 2014-06-10 16:24:04 +02:00
Vincent Breitmoser
e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser
eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser
7324bfcb53 import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
Vincent Breitmoser
d73a3e2fa8 import-log: use supertoast in ImportKeyActivity 2014-06-10 01:52:38 +02:00
Vincent Breitmoser
cdc61c4392 canonicalize: first step(s) 2014-06-10 01:51:16 +02:00
Vincent Breitmoser
067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Vincent Breitmoser
97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
Dominik Schürmann
cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 2014-06-09 22:09:30 +02:00
Dominik Schürmann
d530a7b0ee Update buildTools to 19.1 2014-06-09 21:52:17 +02:00
mar-v-in
08d63340c9 Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
Dominik Schürmann
90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann
a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann
d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
Dominik Schürmann
341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
mar-v-in
5601f1b76f Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
mar-v-in
55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
Vincent Breitmoser
c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser
118225d7d2 import-log: add output to logcat (for debugging) 2014-06-06 17:28:36 +02:00
Vincent Breitmoser
e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +02:00
Vincent Breitmoser
787f6edf32 import-log: add log statements in import routine 2014-06-06 16:15:27 +02:00
Vincent Breitmoser
b995b836a3 import-log: improve operationresultparcel, add indentation 2014-06-06 16:14:15 +02:00
mar-v-in
9d02bc85e2 Fix compile error introduced during merge 2014-06-06 00:51:24 +02:00
mar-v-in
e2164f571e Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-05 23:56:29 +02:00
mar-v-in
36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
mar-v-in
80e9998640 Show keys with android contacts 
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
 2014-06-05 23:22:21 +02:00
Tim Bray
5466adee41 Clean up keyimport.ImportKeysListEntry 2014-06-05 11:58:18 -07:00
Dominik Schürmann
fc3a692002 Merge pull request #645 from timbray/master 
Don't show full fingerprint in key search result lists
 2014-06-05 18:16:29 +02:00
Tim Bray
7811970218 Don't show full fingerprint in key search results 2014-06-05 08:51:55 -07:00
Vincent Breitmoser
c84a1ecfff import-log: add parcelable prototype 2014-06-05 14:17:49 +02:00
mar-v-in
dc1e26f39c Make keylist case insensitive 
You want "michael" to be next to "Michael", don't you?
 2014-06-05 00:59:39 +02:00
Vincent Breitmoser
5ab0d76c69 ui: do show Certify identities button even for secret keys 
Closes #636
 2014-06-04 21:38:30 +02:00
Vincent Breitmoser
36bc0ae676 fix bug with bad verifying master keys 2014-06-04 21:35:36 +02:00
Vincent Breitmoser
2946d442e5 do respect expectedFingerprint during key import 2014-06-04 21:35:03 +02:00
mar-v-in
cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
Vincent Breitmoser
cc1e4dce0a neatness refactoring 2014-06-04 20:27:25 +02:00
mar-v-in
6a63746278 Fix regex for hkp parsing to support multiple uids 2014-06-04 18:07:28 +02:00
mar-v-in
dd959876f4 First version of automatic contact discovery. 
TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
 2014-06-04 18:05:16 +02:00
mar-v-in
cc2ef0c17c Store expired state within ImportKeysListEntry 2014-06-04 18:05:16 +02:00
Tim Bray
54b7b0e522 fixed error message 2014-06-04 08:04:26 -07:00
Dominik Schürmann
52f1f30846 Use fixed gradle versions 2014-06-04 10:22:05 +02:00
Dominik Schürmann
6cb791d567 Use fixed gradle versions 2014-06-04 10:21:28 +02:00
Vincent Breitmoser
4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Vincent Breitmoser
58edc0af67 wrapped-key-ring: add documentation 2014-06-02 13:49:11 +02:00
Vincent Breitmoser
d891f75339 make everything work again 2014-06-02 13:47:48 +02:00
Vincent Breitmoser
e27048fe73 wrapped-key-ring: move key data around in ParcelableKeyRing instead of ImportKeysListEntry 2014-06-02 13:47:48 +02:00
Vincent Breitmoser
ed8b62c32b wrapped-key-ring: no UncachedSecretKeyRing after all 2014-06-02 13:47:48 +02:00
Dominik Schürmann
39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-31 20:54:30 +02:00
Dominik Schürmann
6d1369be56 Pull from transifex 2014-05-31 20:49:56 +02:00
mar-v-in
34b97cb136 Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS 2014-05-29 11:43:41 +02:00
mar-v-in
d4cdc36448 Merge branch 'hkps-support' into automatic-contact-discovery 2014-05-29 11:33:53 +02:00
mar-v-in
3417a7a2de Store nice origin with keybase keys (that can't be interpreted as HKP server) 2014-05-29 10:34:50 +02:00
mar-v-in
518f3e1763 Make abstract methods in Keyserver public (implementations make them public anyway) 2014-05-29 10:33:15 +02:00
mar-v-in
be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS 2014-05-29 10:24:00 +02:00
mar-v-in
c676e53479 Fix url building to support certificate check on hkps servers 
Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
 2014-05-28 20:44:01 +02:00
mar-v-in
cb92c9ccc8 Add hkps support 2014-05-27 21:16:52 +02:00
mar-v-in
8e5767f967 Store origin with ImportKeysListEntry 2014-05-27 20:17:49 +02:00
mar-v-in
3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record 2014-05-27 19:45:58 +02:00
Vincent Breitmoser
a53da491c0 new savekeyring operation (mostly stub) 2014-05-27 13:56:30 +02:00
Vincent Breitmoser
6415290b2d introduce new SaveKeyringParcel 2014-05-27 13:56:28 +02:00
Vincent Breitmoser
ce1c3d1a1e rename SaveKeyringParcel to OldSaveKeyringParcel 2014-05-27 13:53:01 +02:00
Vincent Breitmoser
e7fa124108 update unit test support in build files 2014-05-27 13:52:58 +02:00
Vincent Breitmoser
4a6aaf1e83 fix missing userIds in ImportKeysListEntry 2014-05-27 13:49:39 +02:00
mar-v-in
7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +02:00
Tim Bray
58da3d12b0 Finished cleaning up rebase conflicts post Keyserver exception refactor 2014-05-23 09:42:32 -07:00
Tim Bray
1ff3962acc Add Log.d for QueryFailedException 2014-05-23 09:34:37 -07:00
Tim Bray
dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07:00
Vincent Breitmoser
97af8b2a01 wrapped-key-ring: forgot a part in PgpDecryptVerify 2014-05-23 17:04:15 +02:00
Vincent Breitmoser
c107fc668f introduce WrappedSignature for the ViewCert* ui code 2014-05-23 16:48:41 +02:00
Vincent Breitmoser
91a8a6c2d1 wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader 2014-05-23 16:48:03 +02:00
Vincent Breitmoser
10ad7be46b wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type 2014-05-23 16:44:50 +02:00
Vincent Breitmoser
cd0aba9d43 wrapped-key-ring: encapsulate key flags 2014-05-22 13:05:02 +02:00
Vincent Breitmoser
952bb99a24 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-05-21 23:06:51 +02:00
Vincent Breitmoser
6d7daec37f wrapped-key-ring: use CachedKeyRing where possible 2014-05-21 21:41:51 +02:00
Vincent Breitmoser
ab6c47a9b3 use long rather than String to build uris by key 2014-05-21 21:26:35 +02:00
Vincent Breitmoser
761d87b661 wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing 2014-05-21 21:07:32 +02:00
Dominik Schürmann
8a2ffd8f90 Layout fixes for key import 2014-05-19 00:10:34 +02:00
Dominik Schürmann
8e846dc132 Add license header to FixedDrawerLayout 2014-05-18 23:23:58 +02:00
Dominik Schürmann
6e9acafc6d Merge highlight keyserver pull request 2014-05-18 23:19:22 +02:00
Dominik Schürmann
19072824ba Rename KeyServer to Keyserver 2014-05-18 23:06:50 +02:00
Thialfihar
1386282840 Rename mCurQuery to mQuery for consistency 2014-05-16 11:38:43 +02:00
Thialfihar
84b754341d Use Highlighter instead of HighlightQueryCursorAdapter 2014-05-16 11:38:43 +02:00
Thialfihar
69ce66be94 Add highlighting to keyserver/keybase search 2014-05-16 11:38:43 +02:00
Thialfihar
ab81d8903a Support mutliple search words and highlight them 
For the regex matching it would be smart to sort the words by length,
so the longest matches come first. This only matters for queries with
words containing parts of each other, which is an unlikely event and
even then it doesn't break anything.
 2014-05-16 11:38:12 +02:00
Tim Bray
148a522694 keybase cleanups for revised search output format 2014-05-15 17:14:45 -07:00
Tim Bray
9b71791679 keybase now has key info in search output 2014-05-15 16:19:10 -07:00
Tim Bray
d9df048194 JWalk javadocs 2014-05-14 14:39:24 -07:00
Dominik Schürmann
bbf19248ef Merge pull request #627 from thi/improve-keybase.io-support 
Improve keybase.io support
 2014-05-14 20:19:44 +02:00
Dominik Schürmann
fd12f89ccb Clarify help start 2014-05-14 18:01:40 +02:00
Thialfihar
b8462de6e5 Rename fingerPrint to fingerprint 2014-05-14 17:22:53 +02:00
Thialfihar
73acb69208 Add github, twitter, website info for keybase keys 
The very point of keybase.io is the identification and proven link
to those identities, so it should be nice to have them.
The display is a bit basic still, as it just adds them as userIds,
I'm sure this can be prettified, perhaps with logos?
 2014-05-14 17:21:27 +02:00
Thialfihar
2480844884 Cleanup keybase query a bit 
Remove ctime and the cached key, making the query for the entire user
object unnecessary. This should only be done when the user decides to
import the key. Hopefully keybase.io can provide all info necessary in
the search results.
 2014-05-14 17:21:27 +02:00
Vincent Breitmoser
2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-05-14 16:02:28 +02:00
Thialfihar
056a6dd347 Don't guess keybase key algorithm and size 
Once keybase reports them, we can display them. Until then we simply
don't know and shouldn't lie about it.
 2014-05-14 14:28:54 +02:00
Thialfihar
6162247155 Add extraData property in ImportKeyListEntry 
This allows any KeyServer to store some extra data it might need.
In the case of KeybaseKeyServer it is the username, which then can
be grabbed directly, without the hack of storing it as userId.
 2014-05-14 14:28:41 +02:00
Thialfihar
d50e798c13 List full keybase id or strong key id matches on top 2014-05-14 14:28:26 +02:00
Thialfihar
f4a8e71c33 Make keybase lookup works for key ids starting with 0x 2014-05-14 14:28:13 +02:00
Dominik Schürmann
05a3163f17 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-13 18:52:57 +02:00
Dominik Schürmann
be46eabdb5 Add pgpauth app to help, update html-textview 2014-05-13 18:52:48 +02:00
Daniel Haß
4ed8e45703 Removed unused Toast import 2014-05-11 22:20:44 +02:00
Daniel Haß
010dcf1887 Toast replacement 2014-05-11 22:15:45 +02:00
Daniel Haß
c0b48a616e Fixed wrong AppMsg-Style 2014-05-11 20:28:16 +02:00
Dominik Schürmann
2aa3eb2bb5 Add Tim Bray to about 2014-05-09 11:38:40 +02:00
Dominik Schürmann
1daddfbaab Version 2.7 2014-05-08 19:40:13 +02:00
Dominik Schürmann
37ad355d20 Translations from transifex 2014-05-08 19:39:44 +02:00
Dominik Schürmann
badfa9f7bc Changelog 2.7 2014-05-08 19:32:07 +02:00
Dominik Schürmann
c2b75e3d2e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-08 18:44:58 +02:00
Dominik Schürmann
af4f32e2d7 Translations from transifex 2014-05-08 18:44:54 +02:00
Vincent Breitmoser
4ba06e7735 ui: purplize dialog headers (huge hack inside) 2014-05-08 18:12:55 +02:00
Vincent Breitmoser
cbc3988628 proper null checks and closing of cursors everywhere 2014-05-08 15:57:38 +02:00
Vincent Breitmoser
79117b1ef8 use longsparsearrays instead of hashmaps in that one place 2014-05-08 15:57:38 +02:00
Dominik Schürmann
956b9a12bb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-08 15:47:06 +02:00
Dominik Schürmann
33cad382f9 Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
Vincent Breitmoser
9c5c013538 use setEncryptToSigner for asymmetric encryption 
(tested and works, closes #569)
 2014-05-08 15:31:03 +02:00
Vincent Breitmoser
185c4eed43 use LoaderFragment in ViewKey tabs 
Closes #616
 2014-05-08 13:58:52 +02:00
Vincent Breitmoser
596478a212 extract generic LoaderFragment superclass from KeyList 2014-05-08 13:43:59 +02:00
Dominik Schürmann
5c747a747f Update from transifex 2014-05-08 11:30:16 +02:00
Vincent Breitmoser
346b5dbb28 Don't allow certification using keys where primary subkey is stripped 
Closes #596
 2014-05-07 22:43:14 +02:00
Dominik Schürmann
b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann
ab1b2df2d6 Move API libs and API example into their own git repos 2014-05-07 16:51:06 +02:00
Dominik Schürmann
377edfb310 Remove code for sharing whole key via qr code 2014-05-07 15:40:19 +02:00
Dominik Schürmann
b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann
2a33eae9eb GET_KEY: also return PendingIntent to key view 2014-05-07 14:53:35 +02:00
Dominik Schürmann
e14ce09186 Better handling of actionbars back 2014-05-07 14:33:20 +02:00
Dominik Schürmann
f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann
7c2dc276c1 Alignment in certify activity 2014-05-07 13:48:19 +02:00
Dominik Schürmann
10db9dd09a Change drawer nav icon back to gray 2014-05-07 11:15:40 +02:00
Dominik Schürmann
61fc8d0eee Translations from transifex 2014-05-07 11:01:33 +02:00
Dominik Schürmann
fb0f3c4778 Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
Dominik Schürmann
2481b6e660 Pull translations from transifex 2014-05-07 09:31:01 +02:00
Dominik Schürmann
0155335a59 Clarify language 2014-05-07 09:29:02 +02:00
Dominik Schürmann
b405c1d664 Pull translations from transifex 2014-05-07 09:13:32 +02:00
Dominik Schürmann
a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00
Dominik Schürmann
dc382a2ddd Clarify language 2014-05-07 09:05:28 +02:00
Vincent Breitmoser
174858e9cf ui: apply theme to tab buttons 2014-05-07 03:55:06 +02:00
Vincent Breitmoser
12f1162a1e ui: use SlidingTabLayout in help activity 2014-05-07 03:48:03 +02:00
Vincent Breitmoser
40793935ac ui: primary certification icon was a pixel or two off 2014-05-07 03:19:09 +02:00
Vincent Breitmoser
992d37819c small fix for 6aafb3, forgot to commit this line 2014-05-07 03:18:41 +02:00
Vincent Breitmoser
65274f6c16 ui: purplize searchtext in keylist 2014-05-07 03:07:24 +02:00
Vincent Breitmoser
873b1be75d display AppMsg warning when no encryption subkey is available 2014-05-07 02:27:51 +02:00
Vincent Breitmoser
0bb11be749 ui: slight edit icon cosmetics in keylist 2014-05-07 02:15:09 +02:00
Vincent Breitmoser
6aafb31412 ui: move revocation/expiry notes above tab slider 2014-05-07 02:14:47 +02:00
Vincent Breitmoser
96125b1976 ui: purplize edge overscroll glow effect 2014-05-07 01:39:28 +02:00
Vincent Breitmoser
6a9cb69a1f ui: purpelize fastscroll thumb 2014-05-07 01:13:08 +02:00
Dominik Schürmann
e97cdbd9ad Clarify language 2014-05-06 23:16:08 +02:00
Dominik Schürmann
8eb74d171b Some small style fixes 2014-05-06 23:11:10 +02:00
Dominik Schürmann
1c2919f07f edit button with image 2014-05-06 22:52:50 +02:00
Dominik Schürmann
274326f780 Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
Dominik Schürmann
ad791fd8f8 Move logic classes for import into own sub-package 2014-05-06 22:29:57 +02:00
Vincent Breitmoser
797aeaf6e8 ui: apply purple theme (twi is best color) 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
e0985878d7 ui: use textview buttons in decrypt verify dialogue 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
0d05ff98cb ui: use textviews instead of bootstrap buttons in SignEncrypt 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
d52d455317 ui: make primary star icon slightly larger 2014-05-06 19:18:31 +02:00
Dominik Schürmann
f91457e07f Touch view only once 2014-05-06 15:04:09 +02:00
Vincent Breitmoser
8564c4aca1 ui: use primary icon color for certification status 2014-05-06 00:39:09 +02:00
Vincent Breitmoser
d31ae89824 ui: show revocation and expiry status on info tab 2014-05-06 00:04:37 +02:00
Vincent Breitmoser
162cb1cb7b ui: subkey view redesign 2014-05-05 22:06:09 +02:00
Vincent Breitmoser
0fe0823372 ui: remove primary subkey info 2014-05-05 22:04:57 +02:00
Dominik Schürmann
04f8b2716a Merge pull request #609 from Vadiml1024/master 
Avoid displaying double 0x before keyid in ViewCertActivity
 2014-05-05 11:15:16 +02:00
Dominik Schürmann
158c2466bf Fix license header 2014-05-05 10:13:44 +02:00
Dominik Schürmann
6d10ca678a Merge pull request #603 from timbray/master 
Adds first level of keybase support
 2014-05-05 10:10:47 +02:00
Tim Bray
90b4db0792 Per pull-request comments. 2014-05-04 17:16:58 -07:00
Dominik Schürmann
e48460bb7d Update from transifex 2014-05-05 01:20:51 +02:00
Dominik Schürmann
acfe01e0e2 Update from transifex 2014-05-05 01:20:42 +02:00
Dominik Schürmann
6055b0b0da New key view design, using Android flat buttons and Android icons 2014-05-05 00:58:22 +02:00
Vincent Breitmoser
90ac60b6db wrapped-key-ring: remove more unneeded methods 2014-05-04 17:44:10 +02:00
Vincent Breitmoser
9baddb7d71 wrapped-key-ring: get rid of bc objects in key editor 2014-05-04 17:07:13 +02:00
Vincent Breitmoser
cd8af25ba7 wrapped-key-ring: more work on passphrase caching and certification 2014-05-04 16:59:20 +02:00
Vincent Breitmoser
8cf0638f54 wrapped-key-ring: introduce Uncached*Key objects 2014-05-04 16:56:44 +02:00
Vincent Breitmoser
411b4cfeb2 wrapped-key-ring: redesign underlying CachedKeyRing 2014-05-04 13:22:35 +02:00
Vincent Breitmoser
d0e3af505c wrapped-key-ring: cached data revamp 2014-05-04 13:22:27 +02:00
Vincent Breitmoser
d68fce6875 wrapped-key-ring: view certify 2014-05-04 13:22:19 +02:00
Vincent Breitmoser
b5647b2062 wrapped-key-ring: no more pgp imports in PassphraseDialogFragment 2014-05-04 03:38:58 +02:00
Vincent Breitmoser
f524fa692c wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentService! 2014-05-03 22:29:09 +02:00
Vincent Breitmoser
32baf42515 wrapped-key-ring: small fix to make it work again 2014-05-03 19:14:30 +02:00
Vincent Breitmoser
ef6211e0bd wrapped-key-ring: forgot to add UncachedKeyRing class 2014-05-03 19:05:03 +02:00
Vincent Breitmoser
2176e1ef1c wrapped-key-ring: move more helper methods into keys 2014-05-03 19:04:23 +02:00
Vincent Breitmoser
1f8210f743 wrapped-key-ring: move certification logic into secretkey 2014-05-03 18:32:20 +02:00
Vincent Breitmoser
c2c6a90991 certification is always done with the master key 2014-05-03 15:59:25 +02:00
Vincent Breitmoser
4b3cfd4fa4 wrapped-key-ring: first steps, get rid of key imports in decryptverify and signencrypt 2014-05-03 15:55:28 +02:00
Dominik Schürmann
4053e1ebd7 Update from transifex 2014-05-02 19:57:16 +02:00
Vadim Lebedev
9726ac7a96 Avoid displaying double 0x before keyid in ViewCertActivity 2014-05-02 19:05:43 +02:00
Dominik Schürmann
8e645453b1 Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint 2014-05-02 17:42:40 +02:00
Tim Bray
5b0f19fceb stupid identation stuff 2014-04-30 13:56:56 -07:00
Tim Bray
18ed828608 tidy up IntentService 2014-04-30 13:49:48 -07:00
Tim Bray
4c693b4509 Changes should now be in sync with dominik 2014-04-30 13:46:35 -07:00
Tim Bray
b5fb311c61 keybase ID stuff 2014-04-29 15:04:05 -07:00
Tim Bray
ea1032dbfd Clean up debug crud 2014-04-29 15:04:05 -07:00
Tim Bray
e663dadc32 can search openkeychain, retrieve & install & use keys from there 2014-04-29 15:04:05 -07:00
Dominik Schürmann
e0a0bf04ee Merge pull request #601 from thi/rename-builder-methods 
Rename builder methods
 2014-04-29 19:51:21 +02:00
Dominik Schürmann
5c145cf44d Merge pull request #600 from thi/rename-progressdialogupdater 
Rename progressdialogupdater
 2014-04-29 19:50:30 +02:00
Thialfihar
1f7c61a331 Rename setter methods for PgpDecryptVerify.Builder 2014-04-29 19:01:11 +02:00
Thialfihar
324971e448 Rename setter methods for PgpSignEncrypt.Builder 2014-04-29 18:57:43 +02:00
Thialfihar
9e6bf2abbb Rename ProgressDialogUpdater to Progressable 
Also fix some inconsistent usages of "progress", now using
"progressable" in all builders.
 2014-04-29 18:44:44 +02:00
Thialfihar
6a1832ebad Move util.ProgressDialogUpdater to pgp.Progressable 2014-04-29 18:32:13 +02:00
Dominik Schürmann
30d3c33be9 Formatting KeychainDatabase 2014-04-29 14:02:22 +02:00
Dominik Schürmann
bb0fe2a237 Clarify sqlite datatypes 2014-04-29 10:19:10 +02:00
Dominik Schürmann
1bd357cf55 API: Fix GET_KEY, closes #599 2014-04-28 20:20:23 +02:00
Dominik Schürmann
0963efc78b Many API fixes for GET_KEY and GET_KEY_IDS 2014-04-28 20:13:46 +02:00
Dominik Schürmann
3538bf8202 Version 2.6.1 2014-04-22 11:42:12 +02:00
Dominik Schürmann
e76a8aaedf Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-22 11:38:45 +02:00
Dominik Schürmann
4469b84e2c add has_secret for all who are upgrading from a beta version 2014-04-22 11:38:39 +02:00
Vincent Breitmoser
90324fc10e Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003' 2014-04-22 11:30:43 +02:00
Vincent Breitmoser
30207ee11f Merge commit '0b7fb70' 
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2014-04-22 11:30:14 +02:00
Dominik Schürmann
adea9df714 Workaround for nullpointer bug in support lib, close #591 2014-04-22 08:15:55 +02:00
Vincent Breitmoser
283e3c3365 Fix a nullptr in KeychainProvider 
Fixes #589
 2014-04-20 20:54:40 +02:00
Vincent Breitmoser
9cdb2ec4e2 fix nullpointer on missing s2k 
Fixes #590
 2014-04-20 20:50:26 +02:00
Vincent Breitmoser
0b7fb70781 split up filterSign and filterCertify in SelectSecretKeyFragment 
Closes #588
 2014-04-20 19:38:42 +02:00
Dominik Schürmann
7017a01bdb More code cleanup 2014-04-19 21:56:15 +02:00
Dominik Schürmann
0383822585 version 2.6 2014-04-19 16:02:40 +02:00
Dominik Schürmann
b7147564dc Update from transifex 2014-04-19 15:12:38 +02:00
Dominik Schürmann
3389ee56e4 better error string for too many responses 2014-04-19 15:06:54 +02:00
Dominik Schürmann
b22cf763c4 Trying a fix for #585 2014-04-19 14:47:19 +02:00
Dominik Schürmann
7ee4a44afa Fix some smaller annoyances, closes #583, #582 2014-04-19 14:21:34 +02:00
Dominik Schürmann
71d8bcc8f4 Fix more strings 2014-04-19 14:13:50 +02:00
Dominik Schürmann
8822f6574d certify keys 2014-04-19 02:25:53 +02:00
Dominik Schürmann
ea7726c378 Update from transifex 2014-04-19 02:16:11 +02:00
Vincent Breitmoser
dd8a7c93ad fix unified query columns for select*fragment 2014-04-18 22:18:13 +02:00
Dominik Schürmann
b1cd669f14 Update maven libs and use fixed version 2014-04-18 20:54:13 +02:00
Dominik Schürmann
19d3fcec7a Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
Dominik Schürmann
4a21428e07 Translations from transifex 2014-04-18 19:58:17 +02:00
Dominik Schürmann
b3badac0ee Do not show lookup button in decrypt activity for decryption-only 2014-04-18 19:03:31 +02:00
Dominik Schürmann
cc91369825 Small language corrections (thanks to yahoe.001) 2014-04-18 18:58:02 +02:00
Dominik Schürmann
e044d03d7f FIx nfc button 2014-04-18 17:21:32 +02:00
Dominik Schürmann
a25a5f4d56 Fix upload of keys, closes #581 2014-04-18 01:26:25 +02:00
Dominik Schürmann
a4ae8a72ee OK 2.6 RC1 2014-04-17 18:09:42 +02:00
Dominik Schürmann
2627b08c81 changelog 2.6 2014-04-17 18:07:19 +02:00
Dominik Schürmann
95d25cb6a9 Remove kill hack in KeychainDatabase 2014-04-17 18:00:52 +02:00
Dominik Schürmann
f0e3bb408c Remove dev hack in KeychainDatabase 2014-04-17 17:57:16 +02:00
Dominik Schürmann
a67854ca6a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-17 17:55:52 +02:00
Dominik Schürmann
15b9789b97 Add faq entry for keyserver bug, closes #552 2014-04-17 17:55:41 +02:00
Vincent Breitmoser
8714f56cdc get rid of PgpKeyHelper.getMasterKeyId 
Closes #575
 2014-04-17 16:34:20 +02:00
Vincent Breitmoser
86d9266a44 NotFoundExceptions for all getGeneric-type methods 2014-04-17 16:19:49 +02:00
Vincent Breitmoser
f6e7b92ced load data only once in ImportKeysListLoader 
Fixes #571
 2014-04-17 15:50:18 +02:00
Vincent Breitmoser
2a34d0e0e4 add up navigation in ViewCertActivity 
Fixes #567
 2014-04-17 15:30:16 +02:00
Vincent Breitmoser
fda9bd1386 use project icons for certification status 
Closes #573
 2014-04-17 14:42:24 +02:00
Dominik Schürmann
0be4f69860 Update comments in AndroidManifest 2014-04-17 13:55:46 +02:00
Dominik Schürmann
42fe6c3056 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-17 13:55:34 +02:00
Dominik Schürmann
7879599fd7 Rename provider types following http://developer.android.com/guide/topics/providers/content-provider-creating.html 2014-04-17 13:51:54 +02:00
Vincent Breitmoser
52ad83e345 secret keys can only be deleted individually from multi selection 2014-04-17 12:09:09 +02:00
Dominik Schürmann
d19830cd1c essential instead of integral 2014-04-16 21:54:46 +02:00
Dominik Schürmann
f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00
Dominik Schürmann
b0c65729a9 Merge pull request #576 from Valodim/stripped-secretkeys 
Support stripped secretkeys
 2014-04-16 19:40:36 +02:00
Vincent
8b4700d521 Fix even more whitespace 2014-04-16 19:20:42 +02:00
Vincent
1e64f6b846 Fix more whitespace 2014-04-16 19:20:03 +02:00
Vincent
adb20689fe Fix whitespace 2014-04-16 19:19:17 +02:00
Dominik Schürmann
676262b052 Translations from transifex, fix some strings references 2014-04-16 19:00:06 +02:00
Dominik Schürmann
b8b6fc5f6f Fix help_start 2014-04-16 18:49:17 +02:00