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
827d122ab0
translation fixes
2015-03-23 22:38:20 +01:00
Dominik Schürmann
2204195234
Update build env and plugins
2015-03-23 20:17:30 +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
Manoj Khanna
54a7c72ee9
Updated openpgp-api-lib
2015-03-22 08:16:24 +05:30
Manoj Khanna
4e4b8efd6e
Reworked Notify class
2015-03-20 19:49:42 +05:30
Dominik Schürmann
2153aea197
Update api lib
2015-03-20 15:15:47 +01:00
Dominik Schürmann
75cd80fd37
Update OpenPGP API lib
2015-03-20 14:35:16 +01:00
Dominik Schürmann
9e668eadcb
Fix PASSPHRASE handling in API
2015-03-20 13:38:07 +01:00
Dominik Schürmann
fd8f5ebb2f
Allow for hidden recipients in encrypt methods
2015-03-16 18:20:44 +01:00
Dominik Schürmann
98b942982e
Update api lib
2015-03-16 14:27:26 +01:00
Dominik Schürmann
ae0b85a2e0
Update api lib
2015-03-16 14:06:55 +01:00
Dominik Schürmann
a655664c0b
object oriented split user id
2015-03-16 13:54:01 +01:00
Dominik Schürmann
0e71fcd638
Update openpgp-api lib
2015-03-16 13:03:17 +01:00
Dominik Schürmann
686146a871
Update openpgp lib
2015-03-10 15:17:27 +01:00
Dominik Schürmann
8f44500fdf
Update api lib
2015-03-10 11:35:12 +01:00
Dominik Schürmann
05ef61afd5
Update API lib
2015-03-02 18:21:10 +01:00
Dominik Schürmann
c1130c5b3e
Removed unused submodules
2015-03-02 16:24:26 +01:00
Dominik Schürmann
505140ef2a
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
Dominik Schürmann
6b57afc350
Removed submodule android-lockpattern
2015-02-23 00:17:27 +01:00
Vincent Breitmoser
3efaac2175
determine correct filesize during decryption from LiteralData packet
2015-02-17 18:08:45 +01:00
Dominik Schürmann
15e7e5f7c6
Fix travis for build tools update
2015-01-30 10:24:32 +01:00
Dominik Schürmann
90d1b6b435
Update mini dns lib
2015-01-30 10:10:55 +01:00
Dominik Schürmann
38f7950d90
Saving of allowed keys
2015-01-29 21:00:58 +01:00
Dominik Schürmann
e4e3360866
Update api lib
2015-01-29 15:33:44 +01:00
Dominik Schürmann
6a7d332606
Fix item layout in apps list
2015-01-29 13:24:08 +01:00
Dominik Schürmann
e243e72f86
Update api lib
2015-01-29 11:17:48 +01:00
Dominik Schürmann
81d4d31fd7
Cloud search icon
2015-01-28 18:11:08 +01:00
Dominik Schürmann
d11d3933bc
Update api lib
2015-01-27 14:08:25 +01:00
Dominik Schürmann
ae7ba2639f
Support verification of detached signatures
2015-01-27 13:00:28 +01:00
Dominik Schürmann
e8780b4410
Merge branch 'development' into detached-sigs-api
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Vincent Breitmoser
1516f951b7
work on divert-to-key and other keyring stuff
...
- allow modifySecretKeyRing operation without passphrase, but a only
restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
2015-01-25 01:57:58 +01:00
Vincent Breitmoser
0e0970c347
move key stripping into ChangeSubkey, support divert-to-card
2015-01-24 23:05:50 +01:00
Dominik Schürmann
318d3eb120
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-14 00:04:10 +01:00
Vincent Breitmoser
33ab856214
update spongycastle with more public methods for WrappedUserAttribute
2015-01-13 20:53:38 +01:00
Dominik Schürmann
2f0eb3fbd6
Set minSdk to 14
2015-01-13 19:05:26 +01:00
Dominik Schürmann
374de7ed96
Update safeslinger lib
2015-01-12 15:38:16 +01:00
Vincent Breitmoser
b52fb90380
fix and test for bad certificate version numbers ( #1012 )
...
closes #1012
2015-01-02 01:58:16 +01:00
Dominik Schürmann
320f825878
Add android-lockpattern library
2014-12-29 23:10:50 +01:00
Dominik Schürmann
f8e2dd681b
Update plugin to 1.0
2014-12-12 14:31:41 +01:00
Dominik Schürmann
e41dcd3795
Update for Android Studio 1.0 RC
2014-12-04 19:07:38 +01:00
Dominik Schürmann
2d992f19f7
Update safeslinger lib
2014-10-25 02:39:03 +02:00
Dominik Schürmann
1ec10ec894
Update safeslinger lib
2014-10-07 16:39:19 +02:00
Dominik Schürmann
2c22a4c2f6
Update safeslinger lib
2014-10-03 02:28:01 +02:00
Dominik Schürmann
0a546a3555
Update safeslinger lib
2014-09-24 11:34:04 +02:00
Dominik Schürmann
a59584f230
Removed submodule openpgp-card-nfc-lib
2014-09-24 02:10:04 +02:00
Dominik Schürmann
b373c866e7
Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate
2014-09-24 02:01:53 +02:00
