moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-17 06:15:15 -05:00
Code Issues Releases Wiki Activity
3,189 Commits 12 Branches 24 Tags 116 MiB
f703d55bca
Commit Graph

3189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Breitmoser
4b372a5c33 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:31:04 +02:00
Dominik Schürmann
4fcd58b9f8 use new multi certify, layout fixes 2014-10-04 23:32:25 +02:00
Vincent Breitmoser
f96f289891 merge key ids in getSelectedCertifyActions 2014-10-04 23:30:42 +02:00
Dominik Schürmann
0a264bad28 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:21:49 +02:00
Vincent Breitmoser
015291eb61 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:18:07 +02:00
Vincent Breitmoser
2b436b9a19 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:16:58 +02:00
Vincent Breitmoser
bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +02:00
Dominik Schürmann
fbf993e621 add divider 2014-10-04 23:16:17 +02:00
Dominik Schürmann
e75e3d371d qr code download, cleanup 2014-10-04 21:40:28 +02:00
Dominik Schürmann
0599f0dd4e Workings on new parcel for key downloads 2014-10-04 21:09:32 +02:00
Dominik Schürmann
9e1a0c2c0a Pass imported master key ids via result parcel 2014-10-04 18:59:59 +02:00
Vincent Breitmoser
0ffa1b94de certify: get rid of fingerprint check 
Master key ids are unambiguous by database design, and only keys which
are in the database are signed. There is no reason to check the
fingerprint again during the certify operation.
 2014-10-04 18:30:14 +02:00
Dominik Schürmann
c614d8d4e0 Fixing import, start qr code stuff 2014-10-04 18:22:55 +02:00
Vincent Breitmoser
7e5918efa3 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 16:02:18 +02:00
Vincent Breitmoser
d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Dominik Schürmann
7891560fc2 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 15:42:36 +02:00
Dominik Schürmann
a29d6b0ef3 Import code, fix collision of key spinner with other loaders 2014-10-04 15:42:23 +02:00
Vincent Breitmoser
0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Dominik Schürmann
f0ee7ed4cf New add keys activity 2014-10-04 13:44:34 +02:00
Vincent Breitmoser
dcd22d9815 keychainintentservice: rearrange actions in alphabetical order 2014-10-04 12:31:05 +02:00
Vincent Breitmoser
c30c36fb2a add unit test for duplicate user ids (fix later!!) 2014-10-04 11:49:46 +02:00
Vincent Breitmoser
ff144c7c11 canonicalize: compare user ids as string rather than bytes 2014-10-04 11:14:02 +02:00
Vincent Breitmoser
2b5341f0d4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 23:10:37 +02:00
Vincent Breitmoser
f03822fefd fix nullpointer on button push while data is still loading 
fixes #934
 2014-10-03 23:08:32 +02:00
Dominik Schürmann
f6e0d0f495 Make app_name translatable 2014-10-03 18:49:31 +02:00
Dominik Schürmann
628eef2ab0 Version 3.0.1 2014-10-03 18:42:11 +02:00
Dominik Schürmann
3dfef61de5 Fix string reference 2014-10-03 18:42:03 +02:00
Dominik Schürmann
13cd1daaaa Pull from transifex 2014-10-03 18:37:56 +02:00
Dominik Schürmann
0b572e9001 Changelog 2014-10-03 18:31:47 +02:00
Dominik Schürmann
d5c6e430a5 Null check for getSelectedEntries 2014-10-03 13:37:49 +02:00
Vincent Breitmoser
228e5653f9 one more fix for getting the right subkey in api signing 2014-10-03 13:25:25 +02:00