Dominik Schürmann
|
adbe5ab63f
|
Update gradle plugin, update gradle test plugin
|
2015-03-26 22:56:28 +01:00 |
|
Dominik Schürmann
|
f62a5eded4
|
Merge branch 'development' into v/crypto-input-parcel
|
2015-03-26 22:48:06 +01:00 |
|
Dominik Schürmann
|
d6368db564
|
Merge pull request #1182 from iseki-masaya/1045
#1045: Add a loop for multiple key export.
|
2015-03-26 12:35:50 +01:00 |
|
Dominik Schürmann
|
76db0b3b8e
|
Start refactoring encrypt ui, EncryptFileActivity no longer crashing
|
2015-03-26 11:04:20 +01:00 |
|
iseki
|
621e7401a8
|
Modify break as return.
|
2015-03-26 12:18:41 +09:00 |
|
iseki
|
59a446d7f4
|
Add brackets for if-else constructs and externalize the procedure as showMultiExportDialog.
|
2015-03-26 11:59:18 +09:00 |
|
Dominik Schürmann
|
1ef63f3187
|
Fix certify with CryptoInputParcel
|
2015-03-25 11:12:52 +01:00 |
|
Dominik Schürmann
|
5e024bba2e
|
Remove backward compat in CertifyKeyFragment
|
2015-03-25 10:50:55 +01:00 |
|
iseki
|
e83532cb19
|
Add a loop for multiple key export.
|
2015-03-25 04:44:53 +09:00 |
|
Dominik Schürmann
|
040cf42cb0
|
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
|
2015-03-24 13:19:43 +01:00 |
|
Dominik Schürmann
|
eeccd7cd14
|
3.2beta3
|
2015-03-23 23:04:35 +01:00 |
|
Dominik Schürmann
|
827d122ab0
|
translation fixes
|
2015-03-23 22:38:20 +01:00 |
|
Dominik Schürmann
|
6b164ad8bf
|
Fix language problems reported by yahoe.001 on transifex
|
2015-03-23 22:18:29 +01:00 |
|
Dominik Schürmann
|
2204195234
|
Update build env and plugins
|
2015-03-23 20:17:30 +01:00 |
|
Dominik Schürmann
|
e2f27d0f47
|
Pull from transifex
|
2015-03-23 15:54:48 +01:00 |
|
Dominik Schürmann
|
4405e5fbdd
|
Remove remaining html entities in changelog
|
2015-03-23 15:48:51 +01:00 |
|
Dominik Schürmann
|
4fb88d0049
|
Fix transifex config
|
2015-03-23 15:48:02 +01:00 |
|
Dominik Schürmann
|
95639f2720
|
Merge pull request #1165 from kentnek/dev-yubikey-null
Fixed #1152: NullPointerException when signing with YubiKey
|
2015-03-23 15:39:16 +01:00 |
|
Dominik Schürmann
|
54cd414693
|
Merge pull request #1166 from adithyaphilip/multi-threaded
Multi-threaded key import, update all feature
|
2015-03-23 15:38:57 +01:00 |
|
Dominik Schürmann
|
aa3565b857
|
Fix passphrase cache not clearing all passphrases
|
2015-03-23 15:38:02 +01:00 |
|
Dominik Schürmann
|
30711c3fe7
|
Merge pull request #1174 from Jesperbk/development
Fixed symmetric encryption crash
|
2015-03-23 13:01:10 +01:00 |
|
JesperBK
|
5bdac11ef8
|
Fixed issue where setting a passphrase to null later causes a NullPointerException.
|
2015-03-23 11:17:01 +01:00 |
|
Adithya Abraham Philip
|
9f5581463f
|
shifted multi-threading to own service
added multi-threaded cloud import, restored KeychainIntentService
eliminated code duplication in multi-threaded import
|
2015-03-23 15:37:05 +05:30 |
|
Adithya Abraham Philip
|
19775c399b
|
introduced multi-threading
refactored oldKeys to updatedKeys
added update all keys, ThreadPoolExecutor
used modified CachedThreadPoolExecutor
|
2015-03-23 15:34:22 +05:30 |
|
Vincent Breitmoser
|
c694d73cab
|
further improve yubikey error handling
|
2015-03-23 01:48:44 +01:00 |
|
Dominik Schürmann
|
208434087f
|
Update readme for libs link
|
2015-03-23 01:31:11 +01:00 |
|
Dominik Schürmann
|
78e7e986af
|
Markdown comments
|
2015-03-23 01:23:42 +01:00 |
|
Dominik Schürmann
|
c3cd96d79f
|
Remove changelog in main folder, update comments
|
2015-03-23 01:21:26 +01:00 |
|
Dominik Schürmann
|
fe340c82ba
|
Update transifex config
|
2015-03-23 01:18:56 +01:00 |
|
Dominik Schürmann
|
633b64fd95
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-03-23 01:11:17 +01:00 |
|
Dominik Schürmann
|
b3a599f214
|
Use markdown for in-app help
|
2015-03-23 01:11:11 +01:00 |
|
Vincent Breitmoser
|
3bb194fc08
|
nicer handling of nfc errors
|
2015-03-23 01:09:39 +01:00 |
|
Vincent Breitmoser
|
5227b45af8
|
Merge branch 'development' into v/crypto-input-parcel
|
2015-03-22 22:21:19 +01:00 |
|
Dominik Schürmann
|
4af9b3c7e8
|
Merge pull request #1170 from manojkhannakm/development
Updated openpgp-api-lib
|
2015-03-22 21:09:37 +01:00 |
|
Vincent Breitmoser
|
8b4388e1a2
|
use top line in snackbar for status indication
|
2015-03-22 16:55:46 +01:00 |
|
Vincent Breitmoser
|
b2365fcb97
|
forgot spongycastle update
|
2015-03-22 07:33:41 +01:00 |
|
Vincent Breitmoser
|
5d5e06cabd
|
fix unit test and add new for divert-to-card promotion
|
2015-03-22 07:21:27 +01:00 |
|
Vincent Breitmoser
|
2e838e4cce
|
enable nfc in import dialog as well
|
2015-03-22 06:48:33 +01:00 |
|
Vincent Breitmoser
|
212bba1869
|
finish ui flow for yubikey import
|
2015-03-22 06:36:27 +01:00 |
|
Vincent Breitmoser
|
2151411219
|
actually promote to divert, pass yubikey's AID
|
2015-03-22 03:58:01 +01:00 |
|
Manoj Khanna
|
54a7c72ee9
|
Updated openpgp-api-lib
|
2015-03-22 08:16:24 +05:30 |
|
Vincent Breitmoser
|
22063cdd6e
|
improve status reporting in yubikey dialogue
|
2015-03-22 03:34:34 +01:00 |
|
Vincent Breitmoser
|
a7c52a1c9f
|
move yubikey import into viewkeyfragment
|
2015-03-22 02:36:10 +01:00 |
|
Vincent Breitmoser
|
04c7639a5a
|
split up wait/action yubikey fragments
|
2015-03-21 22:18:58 +01:00 |
|
Vincent Breitmoser
|
1ad3635d13
|
work on ad-hoc yubikey import support
|
2015-03-21 19:52:10 +01:00 |
|
Vincent Breitmoser
|
147003123f
|
first steps toward yubikey activity
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
|
2015-03-21 17:13:35 +01:00 |
|
Vincent Breitmoser
|
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 |
|
Dominik Schürmann
|
c7efaacc9d
|
Merge branch 'manojkhannakm-development' into development
|
2015-03-21 15:43:51 +01:00 |
|
Dominik Schürmann
|
bf427ce9c1
|
Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development
|
2015-03-21 15:43:44 +01:00 |
|
Dominik Schürmann
|
10f9dcd7a1
|
Add TODO to remote API
|
2015-03-21 15:43:36 +01:00 |
|