Commit graph

  • 4b6016fcfc Fix app name Dominik Schürmann 2014-10-05 11:19:19 +02:00
  • 12e44e7eeb Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-05 11:11:20 +02:00
  • 34345cf237 use sub results in import Vincent Breitmoser 2014-10-05 11:11:16 +02:00
  • 6699917279 add support for second line in log view Vincent Breitmoser 2014-10-05 11:10:40 +02:00
  • 2768671206 UI stuff Dominik Schürmann 2014-10-05 10:59:52 +02:00
  • 7fedde2638 add support for hierarchical log entries Vincent Breitmoser 2014-10-05 10:09:50 +02:00
  • 0b9308753d use status icons in public key selection Dominik Schürmann 2014-10-05 04:09:55 +02:00
  • d38b200b01 Add cloud icon Dominik Schürmann 2014-10-05 03:39:44 +02:00
  • 84c624517c Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-05 02:25:36 +02:00
  • 03fb3159b8 Give result down to list Dominik Schürmann 2014-10-05 02:24:43 +02:00
  • 48c843beae even more layout neatification Vincent Breitmoser 2014-10-05 02:15:43 +02:00
  • fa2b3054b0 Make bit size optional Dominik Schürmann 2014-10-05 01:46:56 +02:00
  • 60fb3b60a8 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-05 01:22:01 +02:00
  • d99115c263 preselect certify key Dominik Schürmann 2014-10-05 01:23:34 +02:00
  • dff68ac194 more layout neatification Vincent Breitmoser 2014-10-05 01:21:24 +02:00
  • 15165d056f slight layout changes to keyspinner_item Vincent Breitmoser 2014-10-05 01:06:06 +02:00
  • 1dbb3db320 Display result in multi certify Dominik Schürmann 2014-10-04 23:47:17 +02:00
  • 4b372a5c33 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-04 23:31:04 +02:00
  • 4fcd58b9f8 use new multi certify, layout fixes Dominik Schürmann 2014-10-04 23:32:25 +02:00
  • f96f289891 merge key ids in getSelectedCertifyActions Vincent Breitmoser 2014-10-04 23:30:42 +02:00
  • 0a264bad28 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Dominik Schürmann 2014-10-04 23:21:49 +02:00
  • 015291eb61 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-04 23:16:58 +02:00
  • 2b436b9a19 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-04 23:16:58 +02:00
  • bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) Vincent Breitmoser 2014-10-04 23:16:51 +02:00
  • fbf993e621 add divider Dominik Schürmann 2014-10-04 23:16:17 +02:00
  • e75e3d371d qr code download, cleanup Dominik Schürmann 2014-10-04 21:40:28 +02:00
  • 0599f0dd4e Workings on new parcel for key downloads Dominik Schürmann 2014-10-04 21:09:32 +02:00
  • 9e1a0c2c0a Pass imported master key ids via result parcel Dominik Schürmann 2014-10-04 18:59:59 +02:00
  • 0ffa1b94de certify: get rid of fingerprint check Vincent Breitmoser 2014-10-04 18:28:07 +02:00
  • c614d8d4e0 Fixing import, start qr code stuff Dominik Schürmann 2014-10-04 18:22:55 +02:00
  • 7e5918efa3 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Vincent Breitmoser 2014-10-04 16:02:18 +02:00
  • 23b1ac1716 fix plurals quantity string in ImportKeyResult Vincent Breitmoser 2014-10-04 16:01:59 +02:00
  • d004bf236b improve CertifyResult, add custom notify Vincent Breitmoser 2014-10-04 16:01:24 +02:00
  • 7891560fc2 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify Dominik Schürmann 2014-10-04 15:42:36 +02:00
  • a29d6b0ef3 Import code, fix collision of key spinner with other loaders Dominik Schürmann 2014-10-04 15:42:23 +02:00
  • 0e0e3d8dd0 redesign certify action to work with parcel input and result Vincent Breitmoser 2014-10-04 14:11:51 +02:00
  • ba018d1f1b yubikey: check with correct subkey id for sign operation Vincent Breitmoser 2014-10-04 15:13:38 +02:00
  • f0ee7ed4cf New add keys activity Dominik Schürmann 2014-10-04 13:44:34 +02:00
  • dcd22d9815 keychainintentservice: rearrange actions in alphabetical order Vincent Breitmoser 2014-10-04 12:30:02 +02:00
  • c30c36fb2a add unit test for duplicate user ids (fix later!!) Vincent Breitmoser 2014-10-04 11:49:46 +02:00
  • ff144c7c11 canonicalize: compare user ids as string rather than bytes Vincent Breitmoser 2014-10-04 11:14:02 +02:00
  • 2b5341f0d4 Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-10-03 23:10:37 +02:00
  • f03822fefd fix nullpointer on button push while data is still loading Vincent Breitmoser 2014-10-03 23:08:32 +02:00
  • f6e0d0f495 Make app_name translatable Dominik Schürmann 2014-10-03 18:49:31 +02:00
  • 628eef2ab0 Version 3.0.1 Dominik Schürmann 2014-10-03 18:42:11 +02:00
  • 3dfef61de5 Fix string reference Dominik Schürmann 2014-10-03 18:42:03 +02:00
  • 13cd1daaaa Pull from transifex Dominik Schürmann 2014-10-03 18:37:56 +02:00
  • 0b572e9001 Changelog Dominik Schürmann 2014-10-03 18:31:47 +02:00
  • d5c6e430a5 Null check for getSelectedEntries Dominik Schürmann 2014-10-03 13:37:49 +02:00
  • 228e5653f9 one more fix for getting the right subkey in api signing Vincent Breitmoser 2014-10-03 13:25:25 +02:00
  • 1ed6083a24 forgot adjustments in ProviderHelper Vincent Breitmoser 2014-10-03 04:42:01 +02:00
  • 5d6c2d90c2 fix unit test for ParcelableFileCache Vincent Breitmoser 2014-10-03 04:31:09 +02:00
  • f456c8a17d Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-10-03 04:25:08 +02:00
  • 662cc53859 clean up PgpImportExport a bit Vincent Breitmoser 2014-10-03 04:25:00 +02:00
  • 00bbf8c267 move IteratorWithSize interface into ParcelableFileCache - much cleaner Vincent Breitmoser 2014-10-03 04:22:32 +02:00
  • 504064302b actually use iterator interface for ParcelableFileCache in activities Vincent Breitmoser 2014-10-03 04:06:44 +02:00
  • 04c8d42436 get rid of two consolidate number preferences Vincent Breitmoser 2014-10-03 03:37:08 +02:00
  • a91468565f use iterator interface exclusively in ParcelableFileCache Vincent Breitmoser 2014-10-03 03:29:08 +02:00
  • 4cfc7feb43 More beautifyKeyIdWithPrefix Dominik Schürmann 2014-10-03 03:16:34 +02:00
  • 2c22a4c2f6 Update safeslinger lib Dominik Schürmann 2014-10-03 02:28:01 +02:00
  • ef7eab2c8b Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-10-03 02:20:38 +02:00
  • b9dc21969f Fix nullpointer with clipboard Dominik Schürmann 2014-10-03 02:17:51 +02:00
  • 4b4e885e55 more getActivity() checks Vincent Breitmoser 2014-10-03 02:10:57 +02:00
  • 34e4dabea9 fix nullpointer with subtle attention seeker Vincent Breitmoser 2014-10-03 02:07:09 +02:00
  • 08bfc2ae73 fix hideKeyboard() in other activities as well, just to be safe Vincent Breitmoser 2014-10-02 19:40:43 +02:00
  • a361e82a4d fix NullPointerException in keyboard hack Vincent Breitmoser 2014-10-02 19:35:03 +02:00
  • b6916a9b40 add test case for stripped master key, correct signing subkey should still be selected Vincent Breitmoser 2014-10-02 19:25:20 +02:00
  • 37cb5c4c78 make getSignId a secret key operation, and respect unavailable keys Vincent Breitmoser 2014-10-02 19:23:08 +02:00
  • 9a296c012d Version 3.0 Dominik Schürmann 2014-10-02 14:22:06 +02:00
  • 8192bf99a6 mProgressDialogFragment null check Dominik Schürmann 2014-10-02 14:05:54 +02:00
  • c2f85c7446 Remove unnecessary call to mFingerprintQrCode Dominik Schürmann 2014-10-02 12:50:38 +02:00
  • 6da367e469 Fix IllegalStateException in ViewKeyShareFragment Dominik Schürmann 2014-10-02 12:43:18 +02:00
  • a125b51b1c Fix nullpointer with getS2K() Dominik Schürmann 2014-10-02 12:33:56 +02:00
  • 675d2bd6dd code style Dominik Schürmann 2014-10-02 11:47:42 +02:00
  • 8f616bcf0c Add null check when retrieving key ids from contacts api Dominik Schürmann 2014-10-02 11:32:10 +02:00
  • 17e45d94a8 Add workaround for bug #912 Dominik Schürmann 2014-10-02 11:23:43 +02:00
  • 42ce3bb0d3 Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen Dominik Schürmann 2014-10-01 15:03:53 +02:00
  • e7cbf975ac More debugging output Dominik Schürmann 2014-10-01 14:14:50 +02:00
  • f841203f5f Add filterTouchesWhenObscured to prevent Touch-Event Hijacking Dominik Schürmann 2014-10-01 10:51:02 +02:00
  • 84fcbba74d check key ids when used from api Dominik Schürmann 2014-10-01 10:48:28 +02:00
  • e1a81ae5cd Update from transifex Dominik Schürmann 2014-09-30 20:00:14 +02:00
  • cce2365173 Clarify api_create_account_text Dominik Schürmann 2014-09-30 19:55:30 +02:00
  • b1b16b9313 3.0 beta3 Dominik Schürmann 2014-09-30 17:50:16 +02:00
  • 51ecce510f fix minor logic error (haha) Vincent Breitmoser 2014-09-30 14:10:54 +02:00
  • 354bc87579 fix ByteBuffer offset mistake in NfcActivity Vincent Breitmoser 2014-09-30 11:36:51 +02:00
  • b2b19d7b2b pass (encryption) key id from Decrypt*Fragment to NfcActivity Vincent Breitmoser 2014-09-30 02:13:43 +02:00
  • 11d0f4510b pass key id for check from EncryptActivity to NfcActivity Vincent Breitmoser 2014-09-30 02:03:17 +02:00
  • bd3f6a22cb add (optional) keyId check in NfcActivity Vincent Breitmoser 2014-09-30 01:47:04 +02:00
  • dabdda36cf revamp fingerprint and keyid methods in NfcActivity Vincent Breitmoser 2014-09-30 01:46:16 +02:00
  • de5dd482e1 Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-09-30 00:51:58 +02:00
  • 384724f9b5 request passphrase for correct subkey in OpenPgpService Vincent Breitmoser 2014-09-30 00:50:07 +02:00
  • 0d7ccd2131 Remove description, now in wiki Dominik Schürmann 2014-09-29 23:28:29 +02:00
  • 9e7c9a0d32 Fix nullpointer in DecryptActivity Dominik Schürmann 2014-09-29 23:05:17 +02:00
  • 7531106565 3.0 beta2 Dominik Schürmann 2014-09-29 22:54:36 +02:00
  • f275daf1fb Disable NfcIntentActivity until we implement it properly Dominik Schürmann 2014-09-29 22:54:17 +02:00
  • 43140c10b1 Fixes for share to decrypt Dominik Schürmann 2014-09-29 22:52:03 +02:00
  • 8e5c5c9503 Remove unused layouts Dominik Schürmann 2014-09-29 22:24:55 +02:00
  • 51ea71d68a Maybe fixes encrypt files on tablets Dominik Schürmann 2014-09-29 22:23:48 +02:00
  • 0b16a4edfd Merge remote-tracking branch 'origin/master' Vincent Breitmoser 2014-09-29 21:32:21 +02:00
  • 7f547afe42 add barely functional nfc intent activity (WIP!) Vincent Breitmoser 2014-09-29 21:31:19 +02:00