Tim Bray
54b7b0e522
fixed error message
2014-06-04 08:04:26 -07:00
Vincent Breitmoser
4a47126f05
Merge remote-tracking branch 'origin/master' into edit-key-rewrite
2014-06-02 18:49:24 +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
a53da491c0
new savekeyring operation (mostly stub)
2014-05-27 13:56:30 +02:00
Vincent Breitmoser
ce1c3d1a1e
rename SaveKeyringParcel to OldSaveKeyringParcel
2014-05-27 13:53:01 +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
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
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
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
Thialfihar
b8462de6e5
Rename fingerPrint to fingerprint
2014-05-14 17:22:53 +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
Daniel Haß
c0b48a616e
Fixed wrong AppMsg-Style
2014-05-11 20:28:16 +02:00
Vincent Breitmoser
4ba06e7735
ui: purplize dialog headers (huge hack inside)
2014-05-08 18:12:55 +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
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
377edfb310
Remove code for sharing whole key via qr code
2014-05-07 15:40:19 +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
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
12f1162a1e
ui: use SlidingTabLayout in help activity
2014-05-07 03:48:03 +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
Dominik Schürmann
e97cdbd9ad
Clarify language
2014-05-06 23:16:08 +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
