Dominik Schürmann
|
5517b4f8cf
|
Launcher icon fixes
|
2015-01-14 02:03:20 +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
|
c57355b24a
|
actually import user attributes (though they are not shown anywhere yet)
|
2015-01-14 00:03:02 +01:00 |
|
Vincent Breitmoser
|
2b1c5358b7
|
make user_ids table typed, with attribute_data support
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
|
2015-01-14 00:02:53 +01:00 |
|
Dominik Schürmann
|
7da3ddae7b
|
Refactor BaseActivity
|
2015-01-13 23:43:18 +01:00 |
|
Dominik Schürmann
|
d8ff737fc5
|
Use Toolbar and new BaseActivity
|
2015-01-13 23:15:13 +01:00 |
|
Dominik Schürmann
|
862d1f1971
|
Green
|
2015-01-13 22:18:40 +01:00 |
|
Dominik Schürmann
|
2e3545949b
|
Start working on Material Design
|
2015-01-13 21:55:53 +01:00 |
|
Vincent Breitmoser
|
abd1211613
|
hack to make WrappedUserAttribute serializable
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
|
2015-01-13 20:42:40 +01:00 |
|
Vincent Breitmoser
|
84eece622b
|
support addition of user attributes
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/res/values/strings.xml
|
2015-01-13 20:41:01 +01:00 |
|
Vincent Breitmoser
|
50e515c6cd
|
add support for user attributes in merge() routine
|
2015-01-13 20:37:26 +01:00 |
|
Dominik Schürmann
|
2f0eb3fbd6
|
Set minSdk to 14
|
2015-01-13 19:05:26 +01:00 |
|
Vincent Breitmoser
|
fc85ef71a8
|
remove LinkedIdentity (committed earlier by accident)
|
2015-01-13 00:10:59 +01:00 |
|
Vincent Breitmoser
|
fc3397de5d
|
add support for user attributes (during canonicalization)
|
2015-01-12 20:08:35 +01:00 |
|
Dominik Schürmann
|
3e74405f3c
|
Merge pull request #1023 from adithyaphilip/development
Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
|
2015-01-12 11:03:42 +01:00 |
|
Abraham Philip
|
16f924eef3
|
fixed crash when file scheme is passed, broadened deletion scope
|
2015-01-09 05:07:50 +05:30 |
|
Dominik Schürmann
|
a87a45aa9a
|
No output stream for detached signatures, makes no sense to pipe it through
|
2015-01-08 14:57:09 +01:00 |
|
Dominik Schürmann
|
1c4b8c193d
|
Experimental API support for detached signatures (not tested)
|
2015-01-08 14:48:13 +01:00 |
|
Dominik Schürmann
|
6570483fab
|
Test new icon
|
2015-01-07 14:10:12 +01:00 |
|
Dominik Schürmann
|
816b1bb8c8
|
OpenPGP instead of PGP
|
2015-01-07 13:45:28 +01:00 |
|
Dominik Schürmann
|
443fbaff17
|
PIn not pin passphrase
|
2015-01-07 13:29:56 +01:00 |
|
Dominik Schürmann
|
c4ee00bd39
|
OpenPGP not PGP
|
2015-01-07 00:01:57 +01:00 |
|
Dominik Schürmann
|
6ec85b0550
|
Clearup after lockpattern experiments
|
2015-01-06 19:29:51 +01:00 |
|
Dominik Schürmann
|
af762a65a0
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2015-01-06 14:52:12 +01:00 |
|
Dominik Schürmann
|
e34ad18ed2
|
Passphrase wizard tests
|
2015-01-06 14:52:07 +01:00 |
|
Vincent Breitmoser
|
07251f35ae
|
minor stuff
|
2015-01-03 23:01:57 +01:00 |
|
Vincent Breitmoser
|
47ace7cea3
|
make certify routines more robust (#1016)
|
2015-01-03 22:14:12 +01:00 |
|
Vincent Breitmoser
|
2192a6badd
|
add more descriptive string about non-mdc encrypted data
|
2015-01-03 21:07:33 +01:00 |
|
Vincent Breitmoser
|
320f7d35ef
|
encapsulate high level edit key into new operation class
|
2015-01-03 13:55:15 +01:00 |
|
Vincent Breitmoser
|
5057ea1744
|
deal with non-existent user ids during import (#994)
|
2015-01-02 14:28:03 +01:00 |
|
Vincent Breitmoser
|
920fbdfb42
|
throw exception if no data is found in getGenericData
|
2015-01-02 02:24:11 +01:00 |
|
Vincent Breitmoser
|
56f2a3137b
|
get rid of RuntimeException control flow in UncachedKeyRing.fromStream
|
2015-01-02 02:05:12 +01:00 |
|
Vincent Breitmoser
|
b52fb90380
|
fix and test for bad certificate version numbers (#1012)
closes #1012
|
2015-01-02 01:58:16 +01:00 |
|
Vincent Breitmoser
|
7223abcf0c
|
extend canonicalize to strip local certificates on export
|
2015-01-02 00:07:05 +01:00 |
|
Vincent Breitmoser
|
1c1ae769ef
|
small improvements regarding pin tests and logging
|
2015-01-01 21:13:07 +01:00 |
|
Vincent Breitmoser
|
2d38079574
|
add empty notation data packet only if necessary
|
2015-01-01 20:46:39 +01:00 |
|
Vincent Breitmoser
|
5e9d8ca8c6
|
tests: add multi key encryption/decryption test, new way for fake passphrase cache
|
2015-01-01 20:21:32 +01:00 |
|
Vincent Breitmoser
|
71c53f13ec
|
fix small merge conflict oversight
|
2014-12-30 16:24:20 +01:00 |
|
Vincent Breitmoser
|
9e663237b6
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/res/values/strings.xml
|
2014-12-30 13:09:27 +01:00 |
|
Vincent Breitmoser
|
2223cdd405
|
some small notation data fixes
|
2014-12-30 13:07:56 +01:00 |
|
Vincent Breitmoser
|
438405d3d2
|
add PIN as a SecretKeyType
|
2014-12-30 12:34:24 +01:00 |
|
Vincent Breitmoser
|
7524881a01
|
fix unit tests for ChangeUnlockParcel
|
2014-12-30 12:02:37 +01:00 |
|
Vincent Breitmoser
|
c7b0b650c1
|
introduce handling of notation direct key signatures, and experimental pin notation packet
|
2014-12-30 00:44:12 +01:00 |
|
Dominik Schürmann
|
ccde6add70
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-12-29 23:17:01 +01:00 |
|
Dominik Schürmann
|
610c4780f1
|
New work on PIN and lock pattern UI
|
2014-12-29 23:16:54 +01:00 |
|
Vincent Breitmoser
|
576e6fd0cc
|
introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities
|
2014-12-29 23:12:11 +01:00 |
|
Dominik Schürmann
|
320f825878
|
Add android-lockpattern library
|
2014-12-29 23:10:50 +01:00 |
|
Dominik Schürmann
|
a86abe04cd
|
Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys
|
2014-12-28 20:57:03 +01:00 |
|
Dominik Schürmann
|
7dbf0abf7b
|
Fix crash on first time wizard
|
2014-12-28 19:06:17 +01:00 |
|
Dominik Schürmann
|
26341a325b
|
Update target and support libs to SDK 21, fixing compile issues
|
2014-12-04 22:48:40 +01:00 |
|
Dominik Schürmann
|
6b9749289f
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-12-04 19:44:27 +01:00 |
|
Dominik Schürmann
|
389d191448
|
Merge branch 'master' into development
|
2014-12-04 19:43:41 +01:00 |
|
Dominik Schürmann
|
450ac161b9
|
Set version to 3.2beta1
|
2014-12-04 19:26:10 +01:00 |
|
cketti
|
aa8b3db139
|
Fix spelling of 'K-9 Mail' in FAQ
|
2014-11-26 04:40:58 +01:00 |
|
Dominik Schürmann
|
a805069c59
|
more cleanup
|
2014-11-21 23:55:04 +01:00 |
|
Dominik Schürmann
|
dd65d10406
|
NFC activity design
|
2014-11-21 13:31:43 +01:00 |
|
Dominik Schürmann
|
fc32f5f9d4
|
Minor code cleanup
|
2014-11-21 12:41:39 +01:00 |
|
Dominik Schürmann
|
9de76bb903
|
Version 3.1.2
|
2014-11-02 17:54:33 +01:00 |
|
Dominik Schürmann
|
f3da3b31e5
|
Pull from transifex
|
2014-11-02 17:54:10 +01:00 |
|
Dominik Schürmann
|
602930d929
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-11-02 17:50:38 +01:00 |
|
Dominik Schürmann
|
9dc8c0d506
|
Changelog
|
2014-11-02 17:50:31 +01:00 |
|
Vincent Breitmoser
|
1886dd1790
|
export secret and public keys in separate armored blocks
|
2014-10-31 18:18:09 +01:00 |
|
Vincent Breitmoser
|
8720a21106
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-30 19:48:27 +01:00 |
|
Vincent Breitmoser
|
7017527999
|
forgot a thing for secret key export
|
2014-10-30 15:14:44 +01:00 |
|
Dominik Schürmann
|
f10ec91380
|
Version 3.1.1
|
2014-10-30 12:54:17 +01:00 |
|
Dominik Schürmann
|
148c9a5c62
|
Revert "Version 3.1.1"
This reverts commit 8461f953f6 .
|
2014-10-30 12:54:01 +01:00 |
|
Dominik Schürmann
|
8461f953f6
|
Version 3.1.1
|
2014-10-30 12:53:21 +01:00 |
|
Dominik Schürmann
|
f4d0e5250b
|
Pull from transifex
|
2014-10-30 12:52:33 +01:00 |
|
Dominik Schürmann
|
26a4cf2a56
|
Changelog 3.1.1
|
2014-10-30 12:48:06 +01:00 |
|
Dominik Schürmann
|
18255e331b
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-30 12:44:13 +01:00 |
|
Dominik Schürmann
|
30c3021fea
|
Always use INTEGER instead of BOOLEAN in database to avoid confusion
|
2014-10-29 23:41:10 +01:00 |
|
Vincent Breitmoser
|
a221464f38
|
Fix to preselect certification key if only one is available
Closes #981
|
2014-10-29 22:47:34 +01:00 |
|
Vincent Breitmoser
|
8b53bed6c0
|
remove unused ExchangeKeySpinner class
|
2014-10-29 22:45:49 +01:00 |
|
Vincent Breitmoser
|
e1285eec7b
|
Close stream on key export to avoid partial write (see #986)
|
2014-10-29 22:39:38 +01:00 |
|
Vincent Breitmoser
|
727783dd00
|
retrofit getBlob method of matrixcursor for android 2.3
|
2014-10-27 17:36:53 +01:00 |
|
Dominik Schürmann
|
3e601431ea
|
Version 3.1
|
2014-10-26 23:32:57 +01:00 |
|
Dominik Schürmann
|
e02b2ab30c
|
Pull from transifex
|
2014-10-26 23:32:34 +01:00 |
|
Dominik Schürmann
|
5f20abdb26
|
Pull from transifex
|
2014-10-26 23:23:30 +01:00 |
|
Dominik Schürmann
|
893a4620c1
|
Changelog 3.1
|
2014-10-26 23:15:46 +01:00 |
|
Dominik Schürmann
|
e1b0908290
|
Fix crash with NotFoundException
|
2014-10-26 22:49:34 +01:00 |
|
Dominik Schürmann
|
1e5797387a
|
Rename multi certify files to certify
|
2014-10-26 22:41:40 +01:00 |
|
Dominik Schürmann
|
be31815ee8
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 22:38:35 +01:00 |
|
Dominik Schürmann
|
fa73362a9f
|
Fix notify after certify
|
2014-10-26 22:38:30 +01:00 |
|
Vincent Breitmoser
|
84b234af37
|
Display error on certification attempt with yubikey
Closes #978
|
2014-10-26 22:29:47 +01:00 |
|
Vincent Breitmoser
|
ce58eb4b03
|
disable cancel button instead of hiding it on cancel prevention
|
2014-10-26 22:26:05 +01:00 |
|
Vincent Breitmoser
|
5ce89c4af8
|
fix consolidate if no secret key are present
|
2014-10-26 22:20:44 +01:00 |
|
Vincent Breitmoser
|
35c80ed429
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 22:01:00 +01:00 |
|
Vincent Breitmoser
|
082722a3cf
|
prevent cancel dring consolidate, move logic into progressable
|
2014-10-26 22:00:57 +01:00 |
|
Dominik Schürmann
|
4aed570ee3
|
3.1beta1
|
2014-10-26 05:28:57 +01:00 |
|
Vincent Breitmoser
|
b8ed54bc69
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 05:25:54 +01:00 |
|
Vincent Breitmoser
|
84a57411a5
|
add descriptive text to safeslinger activity
|
2014-10-26 02:12:29 +01:00 |
|
Dominik Schürmann
|
aaa4753503
|
Fix decrypt intent api
|
2014-10-26 02:00:52 +01:00 |
|
Dominik Schürmann
|
dd007e9664
|
Hide keyboard in safe slinger activity
|
2014-10-26 02:36:57 +02:00 |
|
Dominik Schürmann
|
3325ff57a7
|
Use new safe slinger activity from share tab
|
2014-10-26 02:34:51 +02:00 |
|
Dominik Schürmann
|
4631f45ed7
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 02:17:26 +02:00 |
|
Dominik Schürmann
|
be3e6ae6ef
|
Move advanced info into own activity
|
2014-10-26 02:16:39 +02:00 |
|
Vincent Breitmoser
|
d6b9fc27b7
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 01:54:12 +02:00 |
|
Vincent Breitmoser
|
510ef40f55
|
implement upload of keyring after certification, check that option by default
|
2014-10-26 01:50:48 +02:00 |
|
Dominik Schürmann
|
97baa0e52f
|
Keyboard tests
|
2014-10-26 01:09:35 +02:00 |
|
Dominik Schürmann
|
825baeee1b
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 00:38:31 +02:00 |
|
Dominik Schürmann
|
8257e450f9
|
Fixes from transifex
|
2014-10-26 00:38:25 +02:00 |
|
Vincent Breitmoser
|
fb7264d7fd
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-26 00:34:19 +02:00 |
|
Dominik Schürmann
|
f51aebf52d
|
Move some multi select items in overflow menu, rename import
|
2014-10-26 00:30:10 +02:00 |
|
Vincent Breitmoser
|
33738b1f52
|
Retry canonicalization with pubkey self certs if first attempt failed
Fixes #974
|
2014-10-26 00:26:13 +02:00 |
|
Dominik Schürmann
|
94693efbe5
|
Fail on unknown key ids on API, Key item design consistency for API
|
2014-10-26 00:19:14 +02:00 |
|
Dominik Schürmann
|
e4391c282d
|
Fix layout of select key adapter
|
2014-10-26 00:15:35 +02:00 |
|
Dominik Schürmann
|
74bac3ea36
|
Remove empty layout
|
2014-10-25 23:36:48 +02:00 |
|
Dominik Schürmann
|
94e7bbb67b
|
Remove PassphraseDialogFragment
|
2014-10-25 22:56:27 +02:00 |
|
Dominik Schürmann
|
ad60ec2d00
|
Remove old certify activity
|
2014-10-25 22:55:16 +02:00 |
|
Dominik Schürmann
|
c1ef9ed149
|
Use passphrase dialog activity instead of passphrase dialog
|
2014-10-25 22:53:35 +02:00 |
|
Dominik Schürmann
|
1099382250
|
Remove old exception handling code from loaders
|
2014-10-25 22:31:28 +02:00 |
|
Dominik Schürmann
|
8dddc82f69
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 22:25:14 +02:00 |
|
Dominik Schürmann
|
4f37c88ea7
|
Fix color in import list
|
2014-10-25 22:25:11 +02:00 |
|
Vincent Breitmoser
|
b9c0504465
|
remove unnecessary (and buggy) BufferedInputStream wrapping
|
2014-10-25 22:20:55 +02:00 |
|
Dominik Schürmann
|
c2e7c2416f
|
Remove tabs from import keys activity
|
2014-10-25 22:05:55 +02:00 |
|
Dominik Schürmann
|
71e3fb5380
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 21:15:12 +02:00 |
|
Dominik Schürmann
|
0abfff0b0e
|
Fixes and icons for apps list, also add Password Store
|
2014-10-25 21:15:05 +02:00 |
|
Vincent Breitmoser
|
26bd847c32
|
shorter certification explanation
|
2014-10-25 03:18:54 +02:00 |
|
Vincent Breitmoser
|
ce4b8edaab
|
more rewording
|
2014-10-25 03:18:54 +02:00 |
|
Dominik Schürmann
|
d3e0e823e3
|
Fix result passing
|
2014-10-25 03:06:39 +02:00 |
|
Dominik Schürmann
|
e11df08ea1
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 02:57:42 +02:00 |
|
Dominik Schürmann
|
339b283df5
|
Safeslinger fixesÄ
|
2014-10-25 02:57:33 +02:00 |
|
Vincent Breitmoser
|
748049fb5b
|
slightly change wording in merge logs
|
2014-10-25 02:50:48 +02:00 |
|
Vincent Breitmoser
|
c5028dc9ce
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 02:49:37 +02:00 |
|
Vincent Breitmoser
|
30d0afa363
|
change the way merging is logged
|
2014-10-25 02:45:16 +02:00 |
|
Dominik Schürmann
|
49b237d609
|
Fix safe slinger button
|
2014-10-25 02:42:13 +02:00 |
|
Dominik Schürmann
|
418f0970ab
|
Fix safe slinger button
|
2014-10-25 02:41:20 +02:00 |
|
Dominik Schürmann
|
57a26a6cb3
|
Use selected number of users in safe slinger
|
2014-10-25 02:39:48 +02:00 |
|
Dominik Schürmann
|
e332c664cf
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-25 02:38:09 +02:00 |
|
Dominik Schürmann
|
33b54ab03e
|
Safe slinger activity preps
|
2014-10-25 02:38:06 +02:00 |
|
Vincent Breitmoser
|
7c4bbc83cb
|
change indentation of import logs
|
2014-10-25 02:25:39 +02:00 |
|
Vincent Breitmoser
|
059c058040
|
set padding for sublog entries
|
2014-10-25 02:25:28 +02:00 |
|
Vincent Breitmoser
|
ba724353e5
|
more work on import logging
|
2014-10-25 02:13:02 +02:00 |
|
Vincent Breitmoser
|
478b2a4d8b
|
add logging to import and change order of import, keyservers first
|
2014-10-25 01:59:15 +02:00 |
|
Dominik Schürmann
|
1cbedb60d6
|
Qr code button text
|
2014-10-24 00:44:26 +02:00 |
|
Dominik Schürmann
|
b1c164bde0
|
remove space in on large devices in layouts where no drawer nav is shown
|
2014-10-24 00:39:33 +02:00 |
|
Dominik Schürmann
|
9447f8fdf9
|
Fix import from cloud
|
2014-10-24 00:30:58 +02:00 |
|
Dominik Schürmann
|
bfc3774f02
|
Merge pull request #973 from timbray/development
Make the Certify screen a little more self-explanatory
|
2014-10-24 00:23:40 +02:00 |
|
Dominik Schürmann
|
efa5a80eb6
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
|
2014-10-23 23:33:50 +02:00 |
|
Dominik Schürmann
|
1624cd8349
|
Start safe slinger activity
|
2014-10-23 23:31:50 +02:00 |
|
Vincent Breitmoser
|
76a1e99d7e
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-23 23:31:28 +02:00 |
|
Vincent Breitmoser
|
214b60cd00
|
integrate download from keyserver into key import operation
|
2014-10-23 23:29:40 +02:00 |
|
Dominik Schürmann
|
e494beb58a
|
Externalize QR Code scanning and import into its own activity for better code separation
|
2014-10-23 17:13:49 +02:00 |
|
Dominik Schürmann
|
ecfa2288eb
|
Fix crash on Android 5
|
2014-10-22 23:28:13 +02:00 |
|
Tim Bray
|
d4fb71cb76
|
reword sync message
|
2014-10-22 08:19:13 -07:00 |
|
Tim Bray
|
0516b80c07
|
Make the Certify screen a little more self-explanatory
|
2014-10-21 11:35:03 -07:00 |
|
Dominik Schürmann
|
f4f16e62a2
|
consistency for import UI
|
2014-10-16 14:47:36 +02:00 |
|
Dominik Schürmann
|
d09d4296da
|
Silently fail on import on key import with ArrayIndexOutOfBoundsException
|
2014-10-16 13:36:21 +02:00 |
|
Dominik Schürmann
|
81935fe99b
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-15 23:22:12 +02:00 |
|
Dominik Schürmann
|
0cdcc90984
|
More consisitency
|
2014-10-15 23:22:08 +02:00 |
|