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 |
|
Vincent Breitmoser
|
7af0219857
|
fix test for new PgpDecryptVerify
|
2014-10-14 16:35:48 +02:00 |
|
Vincent Breitmoser
|
e58ba0f4bb
|
fix export performance problems
|
2014-10-14 14:19:54 +02:00 |
|
Dominik Schürmann
|
dc87557805
|
Group passphrase cache settings
|
2014-10-13 19:34:41 +02:00 |
|
Dominik Schürmann
|
85d4bcca52
|
Register application/pgp-message for encrypted pgp data, more comments in Manifest
|
2014-10-13 19:17:23 +02:00 |
|
Vincent Breitmoser
|
40850b933b
|
actually remove filter spinner code. that's what git is for~
|
2014-10-13 16:43:17 +02:00 |
|
Dominik Schürmann
|
e9abe57aa7
|
Remove key list filter for now
|
2014-10-13 15:53:39 +02:00 |
|
Vincent Breitmoser
|
bfafc44a33
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-13 15:03:49 +02:00 |
|
Vincent Breitmoser
|
d7d2ce7652
|
fix syntax typo in androidmanifest
|
2014-10-13 15:03:26 +02:00 |
|
Vincent Breitmoser
|
ee4d911baf
|
make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation
|
2014-10-13 15:02:42 +02:00 |
|
Vincent Breitmoser
|
e5c7d8dcd1
|
forgot to remove AddKeysActivity in androidmanifest
|
2014-10-13 15:01:44 +02:00 |
|
Vincent Breitmoser
|
aec61fd174
|
remove DELETE_FILE_SECURELY
closes #961
|
2014-10-13 14:55:54 +02:00 |
|
Dominik Schürmann
|
b86d235177
|
wording
|
2014-10-13 14:44:23 +02:00 |
|
Dominik Schürmann
|
5219cf5207
|
Better qr code icon
|
2014-10-13 14:38:25 +02:00 |
|
Jerzy Kołosowski
|
13ed3bbd8a
|
Added option for num keypad for YubiKey
|
2014-10-13 04:47:48 +02:00 |
|
Vincent Breitmoser
|
7ff526724b
|
forgot committing ExportResult class
|
2014-10-13 01:19:35 +02:00 |
|
Vincent Breitmoser
|
6de52a431a
|
remove outdated AddKeysActivity
|
2014-10-13 00:36:50 +02:00 |
|
Vincent Breitmoser
|
815ed2e233
|
rewrite export with new operation style
|
2014-10-13 00:26:59 +02:00 |
|
Vincent Breitmoser
|
b47412eb1e
|
CertifyOperation is not a Pgp- operation
|
2014-10-12 19:22:34 +02:00 |
|
Vincent Breitmoser
|
93aefaca8e
|
fix logging in consolidate, part 2
|
2014-10-11 20:04:45 +02:00 |
|
Vincent Breitmoser
|
5453a3e5af
|
DeleteResult: add custom createNotify
|
2014-10-11 19:55:19 +02:00 |
|
Vincent Breitmoser
|
4bd9c6ff96
|
fix logging in consolidate, part 1
|
2014-10-11 19:54:07 +02:00 |
|
Vincent Breitmoser
|
e6a7960b8f
|
move delete into operation class
|
2014-10-11 03:50:21 +02:00 |
|
Vincent Breitmoser
|
fe981e5498
|
move around package structure a bit
|
2014-10-10 19:59:25 +02:00 |
|
Vincent Breitmoser
|
ee00894e27
|
different wording in share tab
|
2014-10-10 19:43:34 +02:00 |
|
Vincent Breitmoser
|
ebdcb53c68
|
fix width of displayed qr code
|
2014-10-10 19:42:30 +02:00 |
|
Vincent Breitmoser
|
45dcc7d070
|
move operations into ops package, introduce BaseOperation class
|
2014-10-10 19:31:43 +02:00 |
|
Vincent Breitmoser
|
21ea040910
|
add keys button goes to directly to qr scan
|
2014-10-10 19:05:33 +02:00 |
|
Vincent Breitmoser
|
2dcd070014
|
keylist: add safeslinger exchange button to secret keys
|
2014-10-10 19:05:30 +02:00 |
|
Vincent Breitmoser
|
73ccff9537
|
Merge remote-tracking branch 'origin/development' into development
|
2014-10-09 16:26:38 +02:00 |
|
Vincent Breitmoser
|
340ed7c08d
|
Merge remote-tracking branch 'origin/master' into development
|
2014-10-09 16:25:53 +02:00 |
|
Vincent Breitmoser
|
9d01490d4e
|
reduce memory footprint in QrCodeActivity as well
|
2014-10-09 16:25:38 +02:00 |
|
Vincent Breitmoser
|
a54a0c34fe
|
reduce memory footprint of qr code in share tab
|
2014-10-09 15:57:44 +02:00 |
|
Dominik Schürmann
|
134e1cb764
|
Better handling if no api key is selected
|
2014-10-09 01:52:44 +02:00 |
|
Dominik Schürmann
|
7646baf486
|
Better handling if no api key is selected
|
2014-10-09 01:51:35 +02:00 |
|
Dominik Schürmann
|
45b02008fb
|
Replace many PgpGeneralExceptions with PgpKeyNotFoundException
|
2014-10-09 01:37:44 +02:00 |
|
Dominik Schürmann
|
b3f56c927b
|
Revert "Replace PgpGeneralException with NotFoundException where appropriate"
This reverts commit 49b4ff6312.
|
2014-10-09 00:59:45 +02:00 |
|
Dominik Schürmann
|
a13bcbbb5b
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-09 00:58:33 +02:00 |
|
Dominik Schürmann
|
49b4ff6312
|
Replace PgpGeneralException with NotFoundException where appropriate
|
2014-10-09 00:58:07 +02:00 |
|
Vincent Breitmoser
|
f6d0347c79
|
rename certify_key_item to the more appropriate multi_certify_item
|
2014-10-08 22:47:30 +02:00 |
|
Dominik Schürmann
|
3165f3ffa8
|
Remove unnecessary exception
|
2014-10-08 18:33:01 +02:00 |
|
Dominik Schürmann
|
0d6d4653b4
|
Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys
|
2014-10-08 18:31:31 +02:00 |
|
Dominik Schürmann
|
2eb776594f
|
Handle revoked and expired keys in decrypt activity
|
2014-10-08 17:39:53 +02:00 |
|
Dominik Schürmann
|
158f22a799
|
Merge branch 'development' of github.com:open-keychain/open-keychain into development
|
2014-10-08 17:32:41 +02:00 |
|
Dominik Schürmann
|
b573afe235
|
New decryption screen UI with modernPGP icons
|
2014-10-08 17:32:32 +02:00 |
|
Vincent Breitmoser
|
590650a303
|
remove ui hack, use padding instead of margin
|
2014-10-08 15:36:18 +02:00 |
|
Vincent Breitmoser
|
1b160f68c9
|
slightly change text in certify dialog
|
2014-10-08 15:15:25 +02:00 |
|
Vincent Breitmoser
|
a96813198c
|
use "Key ID" for beautify
|
2014-10-08 15:15:10 +02:00 |
|
Vincent Breitmoser
|
2d438fbc27
|
automatically extend single compound entry logs
|
2014-10-08 15:14:35 +02:00 |
|
Dominik Schürmann
|
adcc07ca65
|
Filter key list by certified keys
|
2014-10-08 14:42:56 +02:00 |
|
Dominik Schürmann
|
678265483a
|
Move utf8 check for user id upwards
|
2014-10-07 18:11:12 +02:00 |
|
Dominik Schürmann
|
27d062496f
|
Fix MSG_MF_UID_PRIMARY log
|
2014-10-07 17:50:09 +02:00 |
|
Dominik Schürmann
|
355bcfbb66
|
Remove monospace from encrypt item
|
2014-10-07 17:37:05 +02:00 |
|
Dominik Schürmann
|
f4c8c47ac2
|
Cleanup and fix decrypt activity
|
2014-10-07 17:35:12 +02:00 |
|
Dominik Schürmann
|
a150c0f480
|
Certify design
|
2014-10-07 17:24:20 +02:00 |
|
Dominik Schürmann
|
280899410f
|
Certify design
|
2014-10-07 17:21:46 +02:00 |
|
Vincent Breitmoser
|
a50034bd10
|
forgot layout piece for 096f6e436
|
2014-10-06 19:25:29 +02:00 |
|
Vincent Breitmoser
|
84a9085190
|
get rid of some old code in LogDisplayFragment
|
2014-10-06 18:58:04 +02:00 |
|
Vincent Breitmoser
|
096f6e436d
|
certify: checkbox fake click area tidbit
|
2014-10-06 18:50:58 +02:00 |
|
Vincent Breitmoser
|
f703d55bca
|
move "synchronize" checkbox to bottom section as well
|
2014-10-06 15:42:47 +02:00 |
|
Vincent Breitmoser
|
b16a550fbb
|
multicertify: move key spinner to the bottom
|
2014-10-06 15:41:15 +02:00 |
|
Dominik Schürmann
|
4b6016fcfc
|
Fix app name
|
2014-10-05 11:19:19 +02:00 |
|
Vincent Breitmoser
|
12e44e7eeb
|
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
|
2014-10-05 11:11:20 +02:00 |
|
Vincent Breitmoser
|
34345cf237
|
use sub results in import
|
2014-10-05 11:11:16 +02:00 |
|
Vincent Breitmoser
|
6699917279
|
add support for second line in log view
|
2014-10-05 11:10:40 +02:00 |
|
Dominik Schürmann
|
2768671206
|
UI stuff
|
2014-10-05 10:59:52 +02:00 |
|
Vincent Breitmoser
|
7fedde2638
|
add support for hierarchical log entries
|
2014-10-05 10:09:50 +02:00 |
|
Dominik Schürmann
|
0b9308753d
|
use status icons in public key selection
|
2014-10-05 04:09:55 +02:00 |
|
Dominik Schürmann
|
d38b200b01
|
Add cloud icon
|
2014-10-05 03:39:44 +02:00 |
|
Vincent Breitmoser
|
84c624517c
|
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
|
2014-10-05 02:25:36 +02:00 |
|
Dominik Schürmann
|
03fb3159b8
|
Give result down to list
|
2014-10-05 02:24:43 +02:00 |
|
Vincent Breitmoser
|
48c843beae
|
even more layout neatification
|
2014-10-05 02:15:43 +02:00 |
|
Dominik Schürmann
|
fa2b3054b0
|
Make bit size optional
|
2014-10-05 01:46:56 +02:00 |
|
Vincent Breitmoser
|
60fb3b60a8
|
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
|
2014-10-05 01:22:01 +02:00 |
|
Dominik Schürmann
|
d99115c263
|
preselect certify key
|
2014-10-05 01:23:34 +02:00 |
|
Vincent Breitmoser
|
dff68ac194
|
more layout neatification
|
2014-10-05 01:21:24 +02:00 |
|
Vincent Breitmoser
|
15165d056f
|
slight layout changes to keyspinner_item
|
2014-10-05 01:07:32 +02:00 |
|
Dominik Schürmann
|
1dbb3db320
|
Display result in multi certify
|
2014-10-04 23:47:17 +02:00 |
|