172 Commits

Author	SHA1	Message	Date
Vincent Breitmoser	d31ae89824	ui: show revocation and expiry status on info tab	2014-05-06 00:04:37 +02:00
Vincent Breitmoser	162cb1cb7b	ui: subkey view redesign	2014-05-05 22:06:09 +02:00
Vincent Breitmoser	0fe0823372	ui: remove primary subkey info	2014-05-05 22:04:57 +02:00
Dominik Schürmann	04f8b2716a	Merge pull request #609 from Vadiml1024/master ... Avoid displaying double 0x before keyid in ViewCertActivity	2014-05-05 11:15:16 +02:00
Dominik Schürmann	158c2466bf	Fix license header	2014-05-05 10:13:44 +02:00
Dominik Schürmann	6d10ca678a	Merge pull request #603 from timbray/master ... Adds first level of keybase support	2014-05-05 10:10:47 +02:00
Tim Bray	90b4db0792	Per pull-request comments.	2014-05-04 17:16:58 -07:00
Dominik Schürmann	e48460bb7d	Update from transifex	2014-05-05 01:20:51 +02:00
Dominik Schürmann	acfe01e0e2	Update from transifex	2014-05-05 01:20:42 +02:00
Dominik Schürmann	6055b0b0da	New key view design, using Android flat buttons and Android icons	2014-05-05 00:58:22 +02:00
Dominik Schürmann	4053e1ebd7	Update from transifex	2014-05-02 19:57:16 +02:00
Vadim Lebedev	9726ac7a96	Avoid displaying double 0x before keyid in ViewCertActivity	2014-05-02 19:05:43 +02:00
Dominik Schürmann	8e645453b1	Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint	2014-05-02 17:42:40 +02:00
Tim Bray	5b0f19fceb	stupid identation stuff	2014-04-30 13:56:56 -07:00
Tim Bray	18ed828608	tidy up IntentService	2014-04-30 13:49:48 -07:00
Tim Bray	4c693b4509	Changes should now be in sync with dominik	2014-04-30 13:46:35 -07:00
Tim Bray	b5fb311c61	keybase ID stuff	2014-04-29 15:04:05 -07:00
Tim Bray	ea1032dbfd	Clean up debug crud	2014-04-29 15:04:05 -07:00
Tim Bray	e663dadc32	can search openkeychain, retrieve & install & use keys from there	2014-04-29 15:04:05 -07:00
Dominik Schürmann	e0a0bf04ee	Merge pull request #601 from thi/rename-builder-methods ... Rename builder methods	2014-04-29 19:51:21 +02:00
Dominik Schürmann	5c145cf44d	Merge pull request #600 from thi/rename-progressdialogupdater ... Rename progressdialogupdater	2014-04-29 19:50:30 +02:00
Thialfihar	1f7c61a331	Rename setter methods for PgpDecryptVerify.Builder	2014-04-29 19:01:11 +02:00
Thialfihar	324971e448	Rename setter methods for PgpSignEncrypt.Builder	2014-04-29 18:57:43 +02:00
Thialfihar	9e6bf2abbb	Rename ProgressDialogUpdater to Progressable ... Also fix some inconsistent usages of "progress", now using "progressable" in all builders.	2014-04-29 18:44:44 +02:00
Thialfihar	6a1832ebad	Move util.ProgressDialogUpdater to pgp.Progressable	2014-04-29 18:32:13 +02:00
Dominik Schürmann	30d3c33be9	Formatting KeychainDatabase	2014-04-29 14:02:22 +02:00
Dominik Schürmann	bb0fe2a237	Clarify sqlite datatypes	2014-04-29 10:19:10 +02:00
Dominik Schürmann	1bd357cf55	API: Fix GET_KEY, closes #599	2014-04-28 20:20:23 +02:00
Dominik Schürmann	0963efc78b	Many API fixes for GET_KEY and GET_KEY_IDS	2014-04-28 20:13:46 +02:00
Dominik Schürmann	3538bf8202	Version 2.6.1	2014-04-22 11:42:12 +02:00
Dominik Schürmann	e76a8aaedf	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-04-22 11:38:45 +02:00
Dominik Schürmann	4469b84e2c	add has_secret for all who are upgrading from a beta version	2014-04-22 11:38:39 +02:00
Vincent Breitmoser	90324fc10e	Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003'	2014-04-22 11:30:43 +02:00
Vincent Breitmoser	30207ee11f	Merge commit '0b7fb70' ... Conflicts: OpenKeychain/src/main/res/values/strings.xml	2014-04-22 11:30:14 +02:00
Dominik Schürmann	adea9df714	Workaround for nullpointer bug in support lib, close #591	2014-04-22 08:15:55 +02:00
Vincent Breitmoser	283e3c3365	Fix a nullptr in KeychainProvider ... Fixes #589	2014-04-20 20:54:40 +02:00
Vincent Breitmoser	9cdb2ec4e2	fix nullpointer on missing s2k ... Fixes #590	2014-04-20 20:50:26 +02:00
Vincent Breitmoser	0b7fb70781	split up filterSign and filterCertify in SelectSecretKeyFragment ... Closes #588	2014-04-20 19:38:42 +02:00
Dominik Schürmann	7017a01bdb	More code cleanup	2014-04-19 21:56:15 +02:00
Dominik Schürmann	0383822585	version 2.6	2014-04-19 16:02:40 +02:00
Dominik Schürmann	b7147564dc	Update from transifex	2014-04-19 15:12:38 +02:00
Dominik Schürmann	3389ee56e4	better error string for too many responses	2014-04-19 15:06:54 +02:00
Dominik Schürmann	b22cf763c4	Trying a fix for #585	2014-04-19 14:47:19 +02:00
Dominik Schürmann	7ee4a44afa	Fix some smaller annoyances, closes #583, #582	2014-04-19 14:21:34 +02:00
Dominik Schürmann	71d8bcc8f4	Fix more strings	2014-04-19 14:13:50 +02:00
Dominik Schürmann	8822f6574d	certify keys	2014-04-19 02:25:53 +02:00
Dominik Schürmann	ea7726c378	Update from transifex	2014-04-19 02:16:11 +02:00
Vincent Breitmoser	dd8a7c93ad	fix unified query columns for select*fragment	2014-04-18 22:18:13 +02:00
Dominik Schürmann	b1cd669f14	Update maven libs and use fixed version	2014-04-18 20:54:13 +02:00
Dominik Schürmann	19d3fcec7a	Remove unused strings, fix some lint errors, fix some language confusions	2014-04-18 20:41:39 +02:00