c694d73cab
further improve yubikey error handling
2015-03-23 01:48:44 +01:00
208434087f
Update readme for libs link
2015-03-23 01:31:11 +01:00
78e7e986af
Markdown comments
2015-03-23 01:23:42 +01:00
c3cd96d79f
Remove changelog in main folder, update comments
2015-03-23 01:21:26 +01:00
fe340c82ba
Update transifex config
2015-03-23 01:18:56 +01:00
633b64fd95
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-23 01:11:17 +01:00
b3a599f214
Use markdown for in-app help
2015-03-23 01:11:11 +01:00
3bb194fc08
nicer handling of nfc errors
2015-03-23 01:09:39 +01:00
5227b45af8
Merge branch 'development' into v/crypto-input-parcel
2015-03-22 22:21:19 +01:00
4af9b3c7e8
Merge pull request #1170 from manojkhannakm/development
...
Updated openpgp-api-lib
2015-03-22 21:09:37 +01:00
8b4388e1a2
use top line in snackbar for status indication
2015-03-22 16:55:46 +01:00
b2365fcb97
forgot spongycastle update
2015-03-22 07:33:41 +01:00
5d5e06cabd
fix unit test and add new for divert-to-card promotion
2015-03-22 07:21:27 +01:00
2e838e4cce
enable nfc in import dialog as well
2015-03-22 06:48:33 +01:00
212bba1869
finish ui flow for yubikey import
2015-03-22 06:36:27 +01:00
2151411219
actually promote to divert, pass yubikey's AID
2015-03-22 03:58:01 +01:00
54a7c72ee9
Updated openpgp-api-lib
2015-03-22 08:16:24 +05:30
22063cdd6e
improve status reporting in yubikey dialogue
2015-03-22 03:34:34 +01:00
a7c52a1c9f
move yubikey import into viewkeyfragment
2015-03-22 02:36:10 +01:00
04c7639a5a
split up wait/action yubikey fragments
2015-03-21 22:18:58 +01:00
1ad3635d13
work on ad-hoc yubikey import support
2015-03-21 19:52:10 +01:00
147003123f
first steps toward yubikey activity
...
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
2015-03-21 17:13:35 +01:00
9ef2795fcd
Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-03-21 15:57:35 +01:00
c7efaacc9d
Merge branch 'manojkhannakm-development' into development
2015-03-21 15:43:51 +01:00
bf427ce9c1
Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development
2015-03-21 15:43:44 +01:00
10f9dcd7a1
Add TODO to remote API
2015-03-21 15:43:36 +01:00
93c7eb72fb
more data in RequiredInputParcel, OperationResult notifications
...
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
2015-03-21 15:16:32 +01:00
88ca41d555
add edit key unit test for no-op
2015-03-20 18:55:16 +01:00
3e51da3afa
fix unit tests (for real)
2015-03-20 18:45:00 +01:00
850a374788
Added docs for Notify class
2015-03-20 19:49:43 +05:30
fa8d5657be
Fixed Snackbar behind keyboard on ImportKeysActivity
2015-03-20 19:49:43 +05:30
4e4b8efd6e
Reworked Notify class
2015-03-20 19:49:42 +05:30
acd6c2ecec
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-20 15:15:54 +01:00
2153aea197
Update api lib
2015-03-20 15:15:47 +01:00
0954b02812
Merge pull request #1163 from kentnek/dev-list-footer
...
Added a blank footer view to the list of keys
2015-03-20 15:01:08 +01:00
e00ce86de9
fix more unit tests (syntax)
2015-03-20 14:57:38 +01:00
75cd80fd37
Update OpenPGP API lib
2015-03-20 14:35:16 +01:00
3fce6d8a12
inline mNfcSignOps variable
2015-03-20 14:22:07 +01:00
879efc2c70
fix unit tests (syntax)
2015-03-20 14:21:55 +01:00
6cf966b63f
re-inline cryptoInput variable
2015-03-20 14:10:00 +01:00
abce05d529
Merge remote-tracking branch 'origin/development' into development
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
2015-03-20 14:01:07 +01:00
ebf9bb3a63
Fix API RESULT_TYPE
2015-03-20 13:51:06 +01:00
9e668eadcb
Fix PASSPHRASE handling in API
2015-03-20 13:38:07 +01:00
10510288f1
Merge pull request #1164 from kentnek/dev-nfc-advanced-view
...
Implemented #1071 : Invoke NFC in Advanced View
2015-03-20 10:16:14 +01:00
50913d0ff1
Updated GNU header
2015-03-20 12:38:16 +08:00
e0a5f1a0d4
Removed create and added GPLv3 header
2015-03-20 12:24:06 +08:00
3b04636f5d
support yubikeys in (some) edit key operations
2015-03-20 02:28:22 +01:00
1d6643fa6b
Fixed #1152 :
...
- Checking if input.getSignatureSubKeyId() is not null before proceeding.
2015-03-20 06:40:52 +08:00
8d6d4328f2
Implemented #1162 : Invoke NFC in Advanced View
...
- Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes
- Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks
- Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment.
- Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
2015-03-20 06:31:18 +08:00
4d43950841
- Added footer so that the Floating Action Button won't block the last few items' content
2015-03-20 06:11:50 +08:00
Vincent Breitmoser