cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,246 Commits 1 Branch 0 Tags
e9abe57aa744c0ec9ea933e02822e23f8bb38544
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dominik Schürmann 4cfc7feb43 More beautifyKeyIdWithPrefix 2014-10-03 03:16:34 +02:00
Dominik Schürmann 2c22a4c2f6 Update safeslinger lib 2014-10-03 02:28:01 +02:00
Dominik Schürmann ef7eab2c8b Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
 2014-10-03 02:20:38 +02:00
Dominik Schürmann b9dc21969f Fix nullpointer with clipboard 2014-10-03 02:17:51 +02:00
Dominik Schürmann 9a296c012d Version 3.0 2014-10-02 14:22:06 +02:00
Dominik Schürmann 8192bf99a6 mProgressDialogFragment null check 2014-10-02 14:05:54 +02:00
Dominik Schürmann c2f85c7446 Remove unnecessary call to mFingerprintQrCode 2014-10-02 12:50:38 +02:00
Dominik Schürmann 6da367e469 Fix IllegalStateException in ViewKeyShareFragment 2014-10-02 12:43:18 +02:00
Dominik Schürmann a125b51b1c Fix nullpointer with getS2K() 2014-10-02 12:33:56 +02:00
Dominik Schürmann 675d2bd6dd code style 2014-10-02 11:47:42 +02:00
Dominik Schürmann 8f616bcf0c Add null check when retrieving key ids from contacts api 2014-10-02 11:32:10 +02:00
Dominik Schürmann 17e45d94a8 Add workaround for bug #912 2014-10-02 11:23:43 +02:00
Dominik Schürmann 42ce3bb0d3 Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen 2014-10-01 15:03:53 +02:00
Dominik Schürmann e7cbf975ac More debugging output 2014-10-01 14:14:50 +02:00
Dominik Schürmann f841203f5f Add filterTouchesWhenObscured to prevent Touch-Event Hijacking 2014-10-01 10:51:02 +02:00
Dominik Schürmann 84fcbba74d check key ids when used from api 2014-10-01 10:48:28 +02:00
Dominik Schürmann e1a81ae5cd Update from transifex 2014-09-30 20:00:14 +02:00
Dominik Schürmann cce2365173 Clarify api_create_account_text 2014-09-30 19:55:30 +02:00
Dominik Schürmann b1b16b9313 3.0 beta3 2014-09-30 17:50:16 +02:00
Dominik Schürmann 0d7ccd2131 Remove description, now in wiki 2014-09-29 23:28:29 +02:00
Dominik Schürmann 9e7c9a0d32 Fix nullpointer in DecryptActivity 2014-09-29 23:05:17 +02:00
Dominik Schürmann 7531106565 3.0 beta2 2014-09-29 22:54:36 +02:00
Dominik Schürmann f275daf1fb Disable NfcIntentActivity until we implement it properly 2014-09-29 22:54:17 +02:00
Dominik Schürmann 43140c10b1 Fixes for share to decrypt 2014-09-29 22:52:03 +02:00
Dominik Schürmann 8e5c5c9503 Remove unused layouts 2014-09-29 22:24:55 +02:00
Dominik Schürmann 51ea71d68a Maybe fixes encrypt files on tablets 2014-09-29 22:23:48 +02:00
Dominik Schürmann f7fe236bd5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-29 21:20:30 +02:00
Dominik Schürmann 654d98ac2a Fix NfcActivity task stack problem 2014-09-29 21:20:01 +02:00
Dominik Schürmann d20f657151 Hide keyboard after cloud search 2014-09-27 14:36:14 +02:00
Dominik Schürmann f22bbbd96c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-27 13:52:05 +02:00
Dominik Schürmann 1a7edc9925 Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible 2014-09-27 13:52:01 +02:00
Dominik Schürmann 4f0ac61b0e Merge pull request #889 from timbray/master 
Fix bug where Keybase extraData gets lost when SKS wins the search race.
 2014-09-25 11:33:57 +02:00
Dominik Schürmann 999094934a Fixes for new app list 2014-09-24 21:30:03 +02:00
Dominik Schürmann d5a1e9bb66 3.0 beta1 2014-09-24 19:11:23 +02:00
Dominik Schürmann 8b663add04 Pull from transifex 2014-09-24 15:41:00 +02:00
Dominik Schürmann 514c8ea9e9 Changelog 2014-09-24 14:59:01 +02:00
Dominik Schürmann 9dbb966b44 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 14:46:03 +02:00
Dominik Schürmann e3a185f698 propose apps in apps list 2014-09-24 14:45:51 +02:00
Dominik Schürmann 5b0cc1fab4 Fix logging in NFcActivity 2014-09-24 11:57:50 +02:00
Dominik Schürmann 0a546a3555 Update safeslinger lib 2014-09-24 11:34:04 +02:00
Dominik Schürmann 382ae968d6 Fix strings reported by yahoe.001 2014-09-24 02:36:24 +02:00
Dominik Schürmann c3e0b3e887 Fix NfcActivity typo 2014-09-24 02:11:41 +02:00
Dominik Schürmann a59584f230 Removed submodule openpgp-card-nfc-lib 2014-09-24 02:10:04 +02:00
Dominik Schürmann 700ee0f202 Removed submodule openpgp-card-nfc-lib 2014-09-24 02:04:26 +02:00
Dominik Schürmann b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann f7d49a48cb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 01:49:50 +02:00
Dominik Schürmann 3850ddea08 DecryptFiles: Reset state for new file decrytion 2014-09-24 01:46:54 +02:00
Dominik Schürmann 6e0938aa93 Fix new decrypt button 2014-09-24 01:41:38 +02:00
Dominik Schürmann 993046d12e cleanup 2014-09-24 01:38:18 +02:00
Dominik Schürmann 42a7cd5eb0 Button text for decrypt 2014-09-24 01:37:00 +02:00
Dominik Schürmann 7f2640711e Fix yubikey file decryption 2014-09-24 01:18:14 +02:00
Dominik Schürmann 0182f7c951 Yubikey text decryption working 2014-09-24 00:57:57 +02:00
Dominik Schürmann 07704c2726 Yubikey decryption 2014-09-24 00:50:58 +02:00