Commit Graph

1750 Commits

Author SHA1 Message Date
Vincent Breitmoser
74027abdad experimental cert list, proper 2014-03-11 02:40:41 +01:00
uberspot
361c45a481 Make export work with rowIds instead of MasterKeyIds 2014-03-11 03:22:05 +02:00
Ashley Hughes
fdb013a052 unused imports 2014-03-11 00:00:19 +00:00
Ashley Hughes
6f0a5d39b2 start modifying save code 2014-03-10 23:53:28 +00:00
uberspot
d937317012 Remove duplicate code from ActionBarHelper. You can now set the drawables via the method calls 2014-03-11 01:50:17 +02:00
Dominik Schürmann
c9b117b706 more tight layout 2014-03-11 00:31:13 +01:00
Dominik Schürmann
50ed5db001 cleanup 2014-03-11 00:28:28 +01:00
Dominik Schürmann
05126a7d15 Merge pull request #394 from sreeram-boyapati/master
linear layout edited to display test horizontally #391
2014-03-11 00:25:26 +01:00
Sreeram Boyapati
dc865427e3 linear layout edited to display test horizontally 2014-03-11 04:50:15 +05:30
Dominik Schürmann
7fc80be660 Merge pull request #392 from honnel/cursor-reset2
Reset cursor query when closing search view #386
2014-03-11 00:15:22 +01:00
Vincent Breitmoser
3b38ffe55e experimental cert display 2014-03-11 00:14:38 +01:00
Vincent Breitmoser
7a8db90425 join cert info into query routines 2014-03-11 00:14:04 +01:00
Vincent Breitmoser
ba7613dc34 experimental cert import 2014-03-11 00:13:03 +01:00
Daniel Hammann
77ebfd0875 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-11 00:12:45 +01:00
Vincent Breitmoser
74f8ec0365 certs: close in from both sides :) 2014-03-11 00:11:27 +01:00
Vincent Breitmoser
535f2caf2c (preliminary) certs table 2014-03-11 00:09:11 +01:00
Daniel Hammann
506782b689 OnFocusChangeListener replaced with OnActionExpandListener
For same behaviour like contacts app #386 #387
2014-03-11 00:07:53 +01:00
Dominik Schürmann
3f5de1eac6 Merge pull request #390 from uberspot/master
Appropriate save Icon in EditKeyActivity fixes #382
2014-03-10 23:48:53 +01:00
uberspot
3cad8b6248 Appropriate save Icon in EditKeyActivity 2014-03-11 00:46:25 +02:00
Dominik Schürmann
612ad9e6b3 Merge pull request #383 from sreeram-boyapati/master
Fix to passphrase dialog and Issue #207
2014-03-10 23:20:07 +01:00
Dominik Schürmann
8fa62161df More fixes for KeychainIntentServiceHandler 2014-03-10 22:46:30 +01:00
Dominik Schürmann
d339029ab9 Pull from transifex 2014-03-10 22:40:59 +01:00
Dominik Schürmann
59091e417f getString before init of KeychainIntentHandler 2014-03-10 22:37:13 +01:00
Dominik Schürmann
bac68c4c73 Fix progress_generating and reformat 2014-03-10 22:22:37 +01:00
Dominik Schürmann
be41a0a3e1 Fix progress_generating and reformat 2014-03-10 22:19:43 +01:00
Daniel Hammann
6fab8a126a Reset cursor query when closing search view #386
Without focus the search result get erased.
2014-03-10 20:58:15 +01:00
Bhargav Golla
b90e680ff9 Lint changes after testing 2014-03-10 14:59:15 -04:00
Dominik Schürmann
da83c8ff60 @color/white instead of hex 2014-03-10 18:26:52 +01:00
Dominik Schürmann
d91e2673d7 Revert "Lint changes"
This reverts commit e00436b409.
2014-03-10 18:23:47 +01:00
Dominik Schürmann
ef8eb3f8b5 Merge pull request #381 from bhargavgolla/Lint-error-fix
Lint changes #223
2014-03-10 18:11:37 +01:00
Sreeram Boyapati
a41ee31b6c Added string reference for Issue #207 2014-03-10 22:37:23 +05:30
Dominik Schürmann
83c346fec4 Make code more tidy for multiselect 2014-03-10 17:49:30 +01:00
Bhargav Golla
e00436b409 Lint changes
Deleting lint-report gen files

Adding lint output files to gitignore
2014-03-10 12:42:00 -04:00
Dominik Schürmann
caa0740919 Improve hightlight query code: make cursor abstract, tidy up code 2014-03-10 17:22:19 +01:00
Dominik Schürmann
70d1e01a2b Merge pull request #384 from mb-14/search1
Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
2014-03-10 17:05:09 +01:00
Dominik Schürmann
2166d66680 Cleanup ImportKeysListEntry 2014-03-10 17:06:11 +01:00
Dominik Schürmann
6a8fa61908 remove double definition of progress_generating 2014-03-10 16:58:58 +01:00
Miroojin Bakshi
b8261d7319 Merge remote-tracking branch 'upstream/master' into search1 2014-03-10 21:11:14 +05:30
Miroojin Bakshi
98da2d0c48 Create custom HighlightQueryCursorAdapter 2014-03-10 21:10:04 +05:30
Dominik Schürmann
3372cfacb6 Merge pull request #385 from tharinduwijewardane/master
Issue #378 ( private keys are no longer red ): Fixed
2014-03-10 16:02:58 +01:00
Tharindu Wijewardane
2b4b09d13c Issue #378 ( private keys are no longer red ): Fixed 2014-03-10 17:10:16 +05:30
Miroojin Bakshi
b927c0f26a Highlight search query in SelectPublicKeyFragment and
KeyListPublicFragment
2014-03-10 15:25:09 +05:30
Sreeram Boyapati
b47f291d12 ViewHolder Pattern Implemented 2014-03-10 11:49:18 +05:30
Sreeram Boyapati
7d2c3f860e Fix to passphrase dialog and Issue #207 2014-03-10 08:31:53 +05:30
Dominik Schürmann
8d85aa5876 remove unneeded replace for newline on fingerprint 2014-03-09 23:51:18 +01:00
Dominik Schürmann
a8add47238 Merge pull request #380 from uberspot/master
Colorize fingerprint
2014-03-09 23:48:51 +01:00
Dominik Schürmann
dd28303dc1 Merge pull request #368 from ajit766/master
progress is shown when creating the default key based on number of keys created till then
2014-03-09 23:39:53 +01:00
Dominik Schürmann
9a7a7f2b01 Merge pull request #372 from rafaelav/master
Issue #178 - Hide advanced options in EncryptActivity
2014-03-09 23:18:50 +01:00
rafaelav
b107766f5b Issue #178 - Hide advanced options in EncryptActivity 2014-03-09 22:30:01 +01:00
grait
4874ea567a progress bar while key creation - added plurals based on no.of keys while key creation 2014-03-09 17:45:58 +05:30