Vincent Breitmoser
879efc2c70
fix unit tests (syntax)
2015-03-20 14:21:55 +01:00
Vincent Breitmoser
6cf966b63f
re-inline cryptoInput variable
2015-03-20 14:10:00 +01:00
Vincent Breitmoser
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
Dominik Schürmann
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
Kent
50913d0ff1
Updated GNU header
2015-03-20 12:38:16 +08:00
Kent
e0a5f1a0d4
Removed create and added GPLv3 header
2015-03-20 12:24:06 +08:00
Vincent Breitmoser
3b04636f5d
support yubikeys in (some) edit key operations
2015-03-20 02:28:22 +01:00
Kent
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
Dominik Schürmann
cfef53be01
Remove on click on icon
2015-03-19 17:21:26 +01:00
Dominik Schürmann
7e5cc9ee70
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-19 17:16:30 +01:00
Dominik Schürmann
98817d13ee
Manage my keys wizard
2015-03-19 17:16:23 +01:00
Dominik Schürmann
9a612131fd
Merge pull request #1158 from manojkhannakm/development
...
Fixed a crash on ViewKeyActivity and Issue #1114
2015-03-19 16:36:37 +01:00
Manoj Khanna
6120365ee1
Fix for Issue #1114
...
Displays the snackbar above the keyboard on all activities.
2015-03-19 19:58:24 +05:30
Manoj Khanna
d122d27eba
Fixed a crash on ViewKeyActivity
...
This occurs when deleting a key with a stripped master key from the
ViewKeyActivity.
2015-03-19 18:54:26 +05:30
Vincent Breitmoser
25d89b5550
generalize NfcOperationParcel to RequiredInputParcel, including passphrases
2015-03-19 14:21:30 +01:00
Dominik Schürmann
0bcc2793c3
Improve Passphrase class with finalize()
2015-03-19 13:58:26 +01:00
Dominik Schürmann
834ce03f9e
Fix header
2015-03-19 03:30:49 +01:00
Dominik Schürmann
e65efce333
Fix tests for Passphrase class
2015-03-19 03:30:12 +01:00
Dominik Schürmann
b24ff10c43
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-19 03:04:08 +01:00
Dominik Schürmann
9c9f95c7ac
New Passphrase class for safer passphrase handling in memory
2015-03-19 03:03:46 +01:00
Dominik Schürmann
d25cc08be4
Merge pull request #1160 from jellysheep/cloudsearch-show-main-email
...
Show HKP server results first in key cloud search. Fixes #1066
2015-03-18 22:58:39 +01:00
Max Mertens
aab32b81b9
Added comments for server result sorting in key search
2015-03-18 22:24:29 +01:00
Vincent Breitmoser
d46fc3740b
yubikey certifications!
2015-03-18 21:12:31 +01:00
Vincent Breitmoser
aca54e31ea
generalize nfc crypto input structure
2015-03-18 18:25:44 +01:00
Max Mertens
74c474e3e2
Show HKP server results first in key cloud search. Fixes #1066
2015-03-18 17:49:57 +01:00
Vincent Breitmoser
4499caef1e
introduce CryptoOperationParcel for nfc data
2015-03-18 14:06:59 +01:00
Dominik Schürmann
53d7c1f533
Merge pull request #1155 from adithyaphilip/development
...
Removed JellyBean restriction on Contact Sync
2015-03-17 14:56:31 +01:00
Adithya Abraham Philip
17181cbc19
contacts work on all supported api levels
2015-03-17 19:07:28 +05:30
Dominik Schürmann
dbcb7a9e10
Manifest cleanup
2015-03-17 13:29:54 +01:00
Dominik Schürmann
7f2a89e125
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-17 13:22:21 +01:00
Dominik Schürmann
444123d040
File extensions into Constants
2015-03-17 13:22:13 +01:00
Dominik Schürmann
1f8c6c2456
Merge pull request #1154 from adithyaphilip/development
...
Removed unnecessary @TargetApi annotation in ContactHelper
2015-03-16 22:52:30 +01:00
Adithya Abraham Philip
6f496730be
removed unnecessary @TargetApi annotation
2015-03-17 02:32:09 +05:30
Dominik Schürmann
025eaf0757
Disable hidden recipients for now
2015-03-16 20:34:27 +01:00
Dominik Schürmann
fd8f5ebb2f
Allow for hidden recipients in encrypt methods
2015-03-16 18:20:44 +01:00
Dominik Schürmann
a5271bf229
Allow encrypt of filenames via overflow menu
2015-03-16 17:00:53 +01:00
Dominik Schürmann
916ff0e0fa
Remove old info from readme
2015-03-16 16:33:37 +01:00
Dominik Schürmann
5d7c1e6fb0
Remove old info from readme
2015-03-16 16:32:13 +01:00
Dominik Schürmann
146fa8d6c0
Clarify certification help screen
2015-03-16 15:05:39 +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
484c3092ee
object oriented split user id
2015-03-16 13:54:12 +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
58450daef4
Fix nullpointer when scanning malformed qr codes
2015-03-16 00:16:20 +01:00
Dominik Schürmann
ad9c35f522
Allow selection of none in SelectSignKeyIdActivity
2015-03-15 22:05:12 +01:00
Dominik Schürmann
5cb22ece30
Clarify MIME usage
2015-03-15 21:17:24 +01:00
Dominik Schürmann
d824ec3bc9
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-15 19:35:12 +01:00
Dominik Schürmann
75368034bd
Put API activites in normal process to allow hydrate/dehydrate of logs
2015-03-15 19:35:03 +01:00
Vincent Breitmoser
db39b779c9
fix expiry of master keys
...
fixes #1141
2015-03-15 19:20:03 +01:00
