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 |
|
Dominik Schürmann
|
4e1053c6fa
|
More color/icon consistency
|
2014-10-15 23:05:29 +02:00 |
|
Vincent Breitmoser
|
b6c7231a7f
|
some cleanup and documentation of *Operation classes
|
2014-10-15 16:57:23 +02:00 |
|
Dominik Schürmann
|
be9b483ee8
|
color experiments
|
2014-10-15 12:48:54 +02:00 |
|
Vincent Breitmoser
|
c7e2b8424e
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-14 16:35:56 +02:00 |
|