Dominik Schürmann
a45aaa2277
Fix import of keyring with pub+sec key with same key id
2015-05-06 04:10:27 +02:00
Dominik Schürmann
d2998ea80d
Rename for consistency
2015-05-06 03:37:57 +02:00
Dominik Schürmann
8de6589c9d
Renaming for consisitency
2015-05-06 03:29:04 +02:00
Dominik Schürmann
f102ae5da5
Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity
2015-05-06 03:26:42 +02:00
Dominik Schürmann
9c0187c6b4
Remove reference to deleted API Demo
2015-05-06 00:33:45 +02:00
Dominik Schürmann
afc91fb918
Switch to new library repos
2015-05-06 00:08:04 +02:00
Dominik Schürmann
f87d21a661
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-05-05 09:27:07 +02:00
Dominik Schürmann
e3f5c6d01e
Cleanup manifest
2015-05-05 09:26:57 +02:00
Dominik Schürmann
855b8c4ef9
Fix nullpointer in file decryption
2015-05-05 09:05:39 +02:00
Dominik Schürmann
9bf01bad14
Merge pull request #1235 from wfaulk/replacement_extra
...
Fix Bluetooth share without breaking others
2015-05-04 23:33:32 +02:00
William Faulk
aba9c884ce
revert unneeded changes for short key ID
2015-05-04 17:15:51 -04:00
William Faulk
7e7892ff2e
revert unneeded changes for old temp Bluetooth share file
2015-05-04 17:15:10 -04:00
William Faulk
44b47e185d
use single file extension
2015-05-04 17:09:59 -04:00
William Faulk
eabc6cd8d4
use TemporaryStorageProvider for Bluetooth Share
2015-05-04 16:49:30 -04:00
William Faulk
af1809eebc
Use FILE_EXTENSION constants
2015-05-04 16:46:16 -04:00
William Faulk
be3e52884f
Use primary user ID for filename instead of short key ID
2015-05-04 16:46:15 -04:00
William Faulk
6383d19dd3
Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater
2015-05-04 16:46:15 -04:00
William Faulk
b06e7cd737
Fix Bluetooth share without breaking others
2015-05-04 16:46:15 -04:00
Dominik Schürmann
291f95db5a
Fix revoked/expired state in decrypt activity
2015-05-04 21:13:07 +02:00
Dominik Schürmann
2583f77f07
Fix cancel/skip in create key wizard
2015-05-04 20:47:19 +02:00
Dominik Schürmann
f3090f2939
Display notify above keyboard in CreateKeyEmailFragment
2015-05-04 15:34:48 +02:00
Dominik Schürmann
2cd1cf9192
Fix email pattern
2015-05-04 15:27:19 +02:00
Dominik Schürmann
9698cb94e3
Merge branch 'Hiperzone-development' into development
2015-05-04 14:56:11 +02:00
Dominik Schürmann
e1ca612bc4
Use more simple email validation regex
2015-05-04 14:55:56 +02:00
Dominik Schürmann
520f9abea3
Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
2015-05-04 14:42:21 +02:00
Dominik Schürmann
045ea93ee1
Merge branch 'manojkhannakm-development' into development
2015-05-04 14:30:12 +02:00
Dominik Schürmann
eb9019c78c
Temporary fix for gradle dependency bug
2015-05-04 14:29:47 +02:00
Dominik Schürmann
dedda1603c
Fix dublicated code in CreateKeyEmailFragment
2015-05-04 14:19:16 +02:00
Dominik Schürmann
39c610c2d1
Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development
2015-05-04 14:18:10 +02:00
Dominik Schürmann
b726dea244
license header for PgpCertifyOperation
2015-05-04 14:12:42 +02:00
Dominik Schürmann
51bb96742f
Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938
2015-05-04 14:01:34 +02:00
Dominik Schürmann
4e425495e6
Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade
2015-05-04 13:57:43 +02:00
Dominik Schürmann
02e86c90b6
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-05-04 13:31:38 +02:00
Dominik Schürmann
6ba4160786
Merge pull request #1238 from wfaulk/fix-tests
...
updated robolectric to support new android support libs
2015-05-04 13:29:43 +02:00
William Faulk
971ceb07d4
updated robolectric to support new android support libs
2015-05-03 14:06:01 -07:00
Dominik Schürmann
aa68c41f5a
Fix yubikey strings
2015-05-01 14:48:57 +02:00
Dominik Schürmann
f3870cee29
More nullpointer fixes
2015-05-01 14:44:40 +02:00
Dominik Schürmann
e91dc022fb
Fix nullpointer in EncryptKeyCompletionView
2015-05-01 14:36:22 +02:00
Dominik Schürmann
5ad50b99a2
Remove time from key creation display
2015-04-30 19:02:33 +02:00
Dominik Schürmann
c88d2e42b7
Fix key creation string and display
2015-04-30 18:57:51 +02:00
Dominik Schürmann
7c275fed9d
API: Allow selection of decryption keys when decryption fails
2015-04-30 18:45:43 +02:00
Daniel Ramos
e159e619d2
-removed unneeded inputType attribute from xml files (+1 squashed commits)
...
Squashed commits:
[ef54e68] -code style fixing
2015-04-30 00:54:56 +01:00
Dominik Schürmann
f623411fb6
Update snackbar
2015-04-30 00:59:57 +02:00
Dominik Schürmann
14921e783f
Update wrapper to verify local cache
2015-04-29 22:56:49 +02:00
Dominik Schürmann
41968206d3
Use own gradle wrapper to verify downloaded gradle package via SHA-256 sum. See https://github.com/gradle/gradle/pull/448
2015-04-29 20:43:46 +02:00
Dominik Schürmann
db59cd0bbf
Merge pull request #1233 from wfaulk/readme
...
Update README.md with new build info
2015-04-29 01:27:34 +02:00
William Faulk
c9e0acec50
Update README.md with new build info
2015-04-28 19:10:45 -04:00
Vincent Breitmoser
3f1fa4d95c
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-04-28 18:22:42 +02:00
Vincent Breitmoser
8ab49b0766
fix crash when moving focus from EncryptKeyCompletionView with unknown text
2015-04-28 18:22:26 +02:00
Vincent Breitmoser
cd55871950
display unknown keys red rather than orange
...
For an unknown key, there is no indication of the state the key is in.
To indicate both immediate action required, and to make this status
equal to its worst case (rather than *better* than its worst case), the
status is displayed in red.
At some point, we will probably want to download unknown keys
automatically, at which point an unknown key will actually be an error
state. This is an intermediate solution until then.
2015-04-28 18:22:24 +02:00
