Commit Graph
100 Commits
Author SHA1 Message Date
Dominik Schürmann 26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann 18255e331b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 12:44:13 +01:00
Dominik Schürmann 30c3021fea Always use INTEGER instead of BOOLEAN in database to avoid confusion 2014-10-29 23:41:10 +01:00
Dominik Schürmann 3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann 5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann 893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +01:00
Dominik Schürmann e1b0908290 Fix crash with NotFoundException 2014-10-26 22:49:34 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann be31815ee8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:38:35 +01:00
Dominik Schürmann fa73362a9f Fix notify after certify 2014-10-26 22:38:30 +01:00
Dominik Schürmann 4aed570ee3 3.1beta1 2014-10-26 05:28:57 +01:00
Dominik Schürmann aaa4753503 Fix decrypt intent api 2014-10-26 02:00:52 +01:00
Dominik Schürmann dd007e9664 Hide keyboard in safe slinger activity 2014-10-26 02:36:57 +02:00
Dominik Schürmann 3325ff57a7 Use new safe slinger activity from share tab 2014-10-26 02:34:51 +02:00
Dominik Schürmann 4631f45ed7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 02:17:26 +02:00
Dominik Schürmann be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Dominik Schürmann 3059007995 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:09:46 +02:00
Dominik Schürmann 97baa0e52f Keyboard tests 2014-10-26 01:09:35 +02:00
Dominik Schürmann 825baeee1b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 00:38:31 +02:00
Dominik Schürmann 8257e450f9 Fixes from transifex 2014-10-26 00:38:25 +02:00
Dominik Schürmann f51aebf52d Move some multi select items in overflow menu, rename import 2014-10-26 00:30:10 +02:00
Dominik Schürmann 94693efbe5 Fail on unknown key ids on API, Key item design consistency for API 2014-10-26 00:19:14 +02:00
Dominik Schürmann e4391c282d Fix layout of select key adapter 2014-10-26 00:15:35 +02:00
Dominik Schürmann 74bac3ea36 Remove empty layout 2014-10-25 23:36:48 +02:00
Dominik Schürmann 94e7bbb67b Remove PassphraseDialogFragment 2014-10-25 22:56:27 +02:00
Dominik Schürmann ad60ec2d00 Remove old certify activity 2014-10-25 22:55:16 +02:00
Dominik Schürmann c1ef9ed149 Use passphrase dialog activity instead of passphrase dialog 2014-10-25 22:53:35 +02:00
Dominik Schürmann 1099382250 Remove old exception handling code from loaders 2014-10-25 22:31:28 +02:00
Dominik Schürmann 8dddc82f69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 22:25:14 +02:00
Dominik Schürmann 4f37c88ea7 Fix color in import list 2014-10-25 22:25:11 +02:00
Dominik Schürmann c2e7c2416f Remove tabs from import keys activity 2014-10-25 22:05:55 +02:00
Dominik Schürmann 71e3fb5380 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 21:15:12 +02:00
Dominik Schürmann 0abfff0b0e Fixes and icons for apps list, also add Password Store 2014-10-25 21:15:05 +02:00
Dominik Schürmann d3e0e823e3 Fix result passing 2014-10-25 03:06:39 +02:00
Dominik Schürmann e11df08ea1 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:57:42 +02:00
Dominik Schürmann 339b283df5 Safeslinger fixesÄ 2014-10-25 02:57:33 +02:00
Dominik Schürmann 49b237d609 Fix safe slinger button 2014-10-25 02:42:13 +02:00
Dominik Schürmann 418f0970ab Fix safe slinger button 2014-10-25 02:41:20 +02:00
Dominik Schürmann 57a26a6cb3 Use selected number of users in safe slinger 2014-10-25 02:39:48 +02:00
Dominik Schürmann 2d992f19f7 Update safeslinger lib 2014-10-25 02:39:03 +02:00
Dominik Schürmann e332c664cf Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:38:09 +02:00
Dominik Schürmann 33b54ab03e Safe slinger activity preps 2014-10-25 02:38:06 +02:00
Dominik Schürmann 1cbedb60d6 Qr code button text 2014-10-24 00:44:26 +02:00
Dominik Schürmann b1c164bde0 remove space in on large devices in layouts where no drawer nav is shown 2014-10-24 00:39:33 +02:00
Dominik Schürmann 9447f8fdf9 Fix import from cloud 2014-10-24 00:30:58 +02:00
Dominik Schürmann bfc3774f02 Merge pull request #973 from timbray/development
Make the Certify screen a little more self-explanatory
2014-10-24 00:23:40 +02:00
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
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
Dominik Schürmann be9b483ee8 color experiments 2014-10-15 12:48: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
Dominik Schürmann e9abe57aa7 Remove key list filter for now 2014-10-13 15:53:39 +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
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
Dominik Schürmann b3f56c927b Revert "Replace PgpGeneralException with NotFoundException where appropriate"
This reverts commit 49b4ff6312.
2014-10-09 00:59:45 +02:00
Dominik Schürmann a13bcbbb5b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-09 00:58:33 +02:00
Dominik Schürmann 49b4ff6312 Replace PgpGeneralException with NotFoundException where appropriate 2014-10-09 00:58:07 +02:00
Dominik Schürmann 3165f3ffa8 Remove unnecessary exception 2014-10-08 18:33:01 +02:00
Dominik Schürmann 0d6d4653b4 Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys 2014-10-08 18:31:31 +02:00
Dominik Schürmann 2eb776594f Handle revoked and expired keys in decrypt activity 2014-10-08 17:39:53 +02:00
Dominik Schürmann 158f22a799 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-08 17:32:41 +02:00
Dominik Schürmann b573afe235 New decryption screen UI with modernPGP icons 2014-10-08 17:32:32 +02:00
Dominik Schürmann adcc07ca65 Filter key list by certified keys 2014-10-08 14:42:56 +02:00
Dominik Schürmann 678265483a Move utf8 check for user id upwards 2014-10-07 18:11:12 +02:00
Dominik Schürmann 27d062496f Fix MSG_MF_UID_PRIMARY log 2014-10-07 17:50:09 +02:00
Dominik Schürmann 355bcfbb66 Remove monospace from encrypt item 2014-10-07 17:37:05 +02:00
Dominik Schürmann f4c8c47ac2 Cleanup and fix decrypt activity 2014-10-07 17:35:12 +02:00
Dominik Schürmann a150c0f480 Certify design 2014-10-07 17:24:20 +02:00
Dominik Schürmann 280899410f Certify design 2014-10-07 17:21:46 +02:00
Dominik Schürmann 1ec10ec894 Update safeslinger lib 2014-10-07 16:39:19 +02:00
Dominik Schürmann 4b6016fcfc Fix app name 2014-10-05 11:19:19 +02:00
Dominik Schürmann 2768671206 UI stuff 2014-10-05 10:59:52 +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
Dominik Schürmann 03fb3159b8 Give result down to list 2014-10-05 02:24:43 +02:00
Dominik Schürmann fa2b3054b0 Make bit size optional 2014-10-05 01:46:56 +02:00
Dominik Schürmann d99115c263 preselect certify key 2014-10-05 01:23:34 +02:00
Dominik Schürmann 1dbb3db320 Display result in multi certify 2014-10-04 23:47:17 +02:00
Dominik Schürmann 4fcd58b9f8 use new multi certify, layout fixes 2014-10-04 23:32:25 +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
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
Dominik Schürmann c614d8d4e0 Fixing import, start qr code stuff 2014-10-04 18:22:55 +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
Dominik Schürmann f0ee7ed4cf New add keys activity 2014-10-04 13:44:34 +02:00