Commit Graph
56 Commits
Author SHA1 Message Date
Vincent Breitmoser 0594d9156e canonicalize: filter out future and local certificates 2014-06-12 21:57:03 +02:00
Vincent Breitmoser 9dd40b7238 import-log: more minor improvements 2014-06-12 21:12:21 +02:00
Vincent Breitmoser 59701250ba import: use wrapped keyring instead of uncached keyring for trust 2014-06-12 18:11:31 +02:00
Vincent Breitmoser e4a7d4f6e5 import-log: minor improvements 2014-06-12 18:10:48 +02:00
Vincent Breitmoser dae503284f canonicalize: more stuff 2014-06-12 17:38:48 +02:00
Vincent Breitmoser 466eddb005 canonicalize: implementation, first draft 2014-06-12 15:47:21 +02:00
Vincent Breitmoser 47368f1d24 import-log: better way to check self trust, and fix log level filtering 2014-06-12 01:37:49 +02:00
Vincent Breitmoser 3895c10a58 import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
Vincent Breitmoser f38556cab1 import-log: switch to flags instead of statuses for result int 2014-06-10 16:24:04 +02:00
Vincent Breitmoser e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser 067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Vincent Breitmoser c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +02:00
Vincent Breitmoser 4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Tim Bray dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07:00
Vincent Breitmoser 2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
2014-05-14 16:02:28 +02:00
Dominik Schürmann b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann fb0f3c4778 Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
Dominik Schürmann 0155335a59 Clarify language 2014-05-07 09:29:02 +02:00
Dominik Schürmann a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00
Dominik Schürmann dc382a2ddd Clarify language 2014-05-07 09:05:28 +02:00
Vincent Breitmoser 873b1be75d display AppMsg warning when no encryption subkey is available 2014-05-07 02:27:51 +02:00
Dominik Schürmann e97cdbd9ad Clarify language 2014-05-06 23:16:08 +02:00
Dominik Schürmann 8eb74d171b Some small style fixes 2014-05-06 23:11:10 +02:00
Dominik Schürmann 274326f780 Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
Vincent Breitmoser 797aeaf6e8 ui: apply purple theme (twi is best color) 2014-05-06 19:18:32 +02:00
Vincent Breitmoser 0d05ff98cb ui: use textviews instead of bootstrap buttons in SignEncrypt 2014-05-06 19:18:32 +02:00
Vincent Breitmoser 0fe0823372 ui: remove primary subkey info 2014-05-05 22:04:57 +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
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
Vincent Breitmoser f524fa692c wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentService! 2014-05-03 22:29:09 +02:00
Tim Bray e663dadc32 can search openkeychain, retrieve & install & use keys from there 2014-04-29 15:04:05 -07:00
Vincent Breitmoser 30207ee11f Merge commit '0b7fb70'
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2014-04-22 11:30:14 +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 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 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 19d3fcec7a Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
Vincent Breitmoser 2a34d0e0e4 add up navigation in ViewCertActivity
Fixes #567
2014-04-17 15:30:16 +02:00
Vincent Breitmoser 52ad83e345 secret keys can only be deleted individually from multi selection 2014-04-17 12:09:09 +02:00
Vincent Breitmoser c7eb40b814 stripped support: implement has_secret support, in ui and impot of secret keys
Closes #570
2014-04-16 18:14:44 +02:00
Dominik Schürmann 14a8586e8c Improve verification result display, close #568 2014-04-15 22:37:36 +02:00
Dominik Schürmann 13ffd2038d key edit: fix crash when create date was after expiry date, change from gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity 2014-04-14 01:11:08 +02:00
Dominik Schürmann 305b8c1858 Simplify and fix delete key dialog 2014-04-11 19:52:59 +02:00