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 |
|
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 |
|
Dominik Schürmann
|
78e313ec42
|
Merge pull request #963 from jkolo/feature/numpad4yubikey
Added option for num keypad for YubiKey
|
2014-10-13 08:46:57 +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 |
|