Commit Graph
100 Commits
Author SHA1 Message Date
Dominik Schürmann 07f28012b5 Merge branch 'master' of github.com:open-keychain/open-keychain 2017-02-22 17:34:50 +01:00
Dominik Schürmann 74c5197bc6 Use new appengine instance with Python 2.7 2017-02-22 17:34:22 +01:00
Dominik Schürmann 626cd2a40a Fix UnsupportedCharsetException in add, closes #2057 2017-02-17 08:54:33 +01:00
Dominik Schürmann 967bebb99c Init libkeychain and move some utils 2017-02-10 18:14:26 +01:00
Dominik Schürmann 147539a832 README: Update links to graphics 2017-02-10 08:59:48 +01:00
Dominik Schürmann 5987b6db26 Merge branch 'master' of github.com:open-keychain/open-keychain 2017-02-10 08:56:18 +01:00
Dominik Schürmann a8246b2b4e Make graphics and resources folder lowercase 2017-02-10 08:56:02 +01:00
Dominik Schürmann 5566cf7176 Do not encrypt filenames by default 2017-02-09 20:02:23 +01:00
Dominik Schürmann 5f56d3b85a Move intents into Constants class 2017-02-07 21:17:15 +01:00
Dominik Schürmann d75138e63b Remove AGP db upgrade 2017-02-07 13:28:59 +01:00
Dominik Schürmann 0777732fad Version 4.2.4 2017-02-07 13:20:28 +01:00
Dominik Schürmann 8fa9f3b2ba emergency fix for crashing consolidate 2017-02-07 13:18:36 +01:00
Dominik Schürmann e214108294 Version 4.2.3 2017-02-06 22:19:20 +01:00
Dominik Schürmann b593c0d9e0 Update openpgp-api 2017-02-06 22:18:40 +01:00
Dominik Schürmann 68916c5838 More information in import_qr_code_wrong 2017-02-05 12:46:31 +01:00
Dominik Schürmann e584e51ead Remove unused PQC package from BC 2017-02-03 13:24:36 +01:00
Dominik Schürmann 4a2a3bed06 Version 4.2.2 2017-02-02 17:26:00 +01:00
Dominik Schürmann 25494519cb Update build instructions 2017-02-02 13:23:53 +01:00
Dominik Schürmann 70678ecd81 Update robolectric config 2017-02-02 11:36:12 +01:00
Dominik Schürmann 8d0c747bc9 Remove openkeychain-api gradle deps 2017-02-02 11:12:25 +01:00
Dominik Schürmann 8105cca6c1 Removed submodule openkeychain-api 2017-02-02 11:10:10 +01:00
Dominik Schürmann 2625da55ed Add OpenKeychainIntents into main git 2017-02-02 11:08:27 +01:00
Dominik Schürmann b831cd5725 Update Robolectric to 3.2.2 2017-02-02 10:57:16 +01:00
Dominik Schürmann 694d03fb2d Update travis config 2017-02-02 10:56:00 +01:00
Dominik Schürmann 2b9144a863 Unify syntax in build.gradle 2017-02-02 10:55:52 +01:00
Dominik Schürmann 0fcdc3df58 Disable ProsGuard for debug builds 2017-02-02 10:55:34 +01:00
Dominik Schürmann ad8e115d96 Remove unused TLS package in BC 2017-02-02 10:52:44 +01:00
Dominik Schürmann f27e55fdce Update build env of submodules 2017-02-02 10:50:40 +01:00
Dominik Schürmann 7d09040cc6 Update build env 2017-02-02 10:50:30 +01:00
Dominik Schürmann d2a2b11e66 Version 4.2.2-beta 2017-01-29 17:01:14 +01:00
Dominik SchürmannandGitHub 146833916b Merge pull request #2011 from rhari991/restrict-sign-keys
API: Restrict secret keys for sign operation
2017-01-29 13:25:02 +01:00
Dominik SchürmannandGitHub a29ccdeb4e Merge pull request #2001 from open-keychain/temp-queried-table
externalprovider: use temp table for query
2017-01-27 00:58:55 +01:00
Dominik SchürmannandGitHub 507f0b6065 Merge pull request #1999 from Poussinou/master
Add buttons to get the app easily ;)
2017-01-27 00:57:13 +01:00
Dominik Schürmann d125937df9 Merge branch 'daquexian-issue_1846' 2017-01-27 00:53:06 +01:00
Dominik Schürmann 78bbe20149 Add missing columns for projections, remove use of raw user id 2017-01-27 00:52:54 +01:00
Dominik Schürmann 732aa0de60 Merge branch 'issue_1846' of https://github.com/daquexian/open-keychain into daquexian-issue_1846 2017-01-27 00:11:11 +01:00
Dominik Schürmann 72d62a847f Fix NPE when onion address is empty 2017-01-27 00:04:22 +01:00
Dominik Schürmann 6e7ad0f27d Disable search view from SelectPublicKeyFragment.
Needs to be fixed. When searching, previously
selected keys are no longer selected.
2017-01-26 23:42:37 +01:00
Dominik SchürmannandGitHub a0af68bf24 Merge pull request #2013 from open-keychain/user-id-parsing
Better handling of User ID corner cases
2017-01-26 23:22:37 +01:00
Dominik Schürmann 86098688ab Increase DB version to re-execute splitUserId for each key 2017-01-26 23:04:09 +01:00
Dominik Schürmann 962e570e91 Better handling of User ID corner cases 2017-01-26 22:55:37 +01:00
Dominik Schürmann d6ca853513 Add github templates adapted from https://github.com/keepassxreboot/keepassxc 2017-01-24 13:24:34 +01:00
Dominik SchürmannandGitHub 4bdccd329c Merge pull request #2008 from rhari991/remove-uninstalled-apps-automatically
Remove api apps when they are uninstalled
2017-01-24 11:40:25 +01:00
Dominik SchürmannandGitHub 7bccb3bbf2 Merge pull request #2010 from lverns/language-tweak
Update English message for security_token_reset_or_import
2017-01-24 11:27:15 +01:00
Dominik SchürmannandGitHub bea7f2098f Merge pull request #1998 from ka7/spelling
spelling fixes
2017-01-14 16:21:25 +01:00
Dominik Schürmann 4e9e113879 Version 4.2.1 2017-01-12 00:18:33 +01:00
Dominik SchürmannandGitHub 74ff0fdd71 Merge pull request #1993 from open-keychain/key-extractor
Move key extraction logic into its own class
2017-01-12 00:16:14 +01:00
Dominik Schürmann 28875ae2ee Version 4.2 2017-01-10 13:42:08 +01:00
Dominik Schürmann 7c2fee9609 Use card_black design for security tokens 2017-01-10 13:32:10 +01:00
Dominik Schürmann 318903cd85 Use nordpols new TagDispatcherBuilder 2017-01-10 13:14:23 +01:00
Dominik Schürmann 7a9f951dc9 Update libraries 2017-01-10 13:01:02 +01:00
Dominik Schürmann 04c2e246ce Add new devs to about list, closes #1984 2017-01-10 11:22:36 +01:00
Dominik Schürmann 62f972c1cf Update openpgp-api lib to master 2017-01-05 17:17:42 +01:00
Dominik SchürmannandGitHub ede6754eda Merge pull request #1980 from open-keychain/fix-duplicate-keys
fix loop bug in key selection
2017-01-05 17:10:34 +01:00
Dominik Schürmann a2f1f38c40 Version 4.2-beta2 2017-01-05 15:49:55 +01:00
Dominik Schürmann 9c857ca66e Pull from transifex 2017-01-05 14:27:59 +01:00
Dominik Schürmann 1b64ffe561 Merge branch 'af-anssi' 2017-01-05 14:13:01 +01:00
Dominik Schürmann 068327c939 Fix to hide PIN input in dialog 2017-01-05 14:10:22 +01:00
Dominik Schürmann 960ebfed0c move NetworkReceiver 2017-01-05 13:59:26 +01:00
Dominik Schürmann 63244a113a Code formatting and package re-structuring 2017-01-05 13:56:09 +01:00
Dominik Schürmann b89ba85313 skip algorithm screen for security tokens version < 3.0 2017-01-05 13:40:40 +01:00
Dominik Schürmann 7616c1c8b8 saved instead of remembered, fixes #1976 2017-01-03 21:54:16 +01:00
Dominik SchürmannandGitHub a160c8fe7f Merge pull request #1973 from open-keychain/fix-multi-import-load
fix loading of multiple keys simultaneously
2017-01-01 16:58:25 +01:00
Dominik Schürmann 42f213f4ef Some docs 2016-12-28 19:05:06 +01:00
Dominik Schürmann f128653de4 Positive if-else + comments 2016-12-28 19:00:25 +01:00
Dominik Schürmann 1bf4ccf67c Fix OOM bug in multi threaded key import, fixes #1960 2016-12-28 18:52:29 +01:00
Dominik Schürmann 3363bbfb87 KeyListFragment: make import callback inline 2016-12-06 10:35:12 +01:00
Dominik Schürmann a1c0ef48d2 Minor code style changes 2016-12-06 10:30:30 +01:00
Dominik Schürmann 891ce29785 Skip dependency checks for bottomsheet 2016-12-05 17:12:50 +01:00
Dominik Schürmann e7ca41c1e9 Fix height of section headers on Android 7 2016-12-05 16:58:40 +01:00
Dominik Schürmann 4d551c5c1a Pull from transifex 2016-12-05 13:55:00 +01:00
Dominik Schürmann b4e936fc3f Fix padding and scrollbar in import 2016-12-05 13:50:33 +01:00
Dominik Schürmann c064a46b36 Catch unsupported charset for keyservers 2016-12-05 13:24:43 +01:00
Dominik Schürmann 7fa2c97cdc Add missing license headers, cleanup 2016-12-05 12:55:16 +01:00
Dominik Schürmann f8f7fb7d14 Fix advanced upload, use OkHttp's HttpUrl class 2016-12-05 12:35:17 +01:00
Dominik Schürmann c57b544395 Add some missing license statements 2016-12-05 11:47:31 +01:00
Dominik Schürmann 2b89ed66c9 Remove unused word verification 2016-12-05 11:34:03 +01:00
Dominik Schürmann dd69621408 Do not use ImportKeysListFragment for Security Token import, fixes #1959. Also introduces radio button to import key information from file 2016-12-04 22:58:41 +01:00
Dominik Schürmann 553f90f145 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-12-04 20:13:19 +01:00
Dominik Schürmann 5e92bdd65b Update support lib to 25.0.1 2016-12-04 20:12:37 +01:00
Dominik Schürmann eed4de9941 Merge branch 'tobsbot-recycler-view' 2016-12-04 20:08:35 +01:00
Dominik Schürmann 7ec84230b0 Fix crash with coinbase handle 2016-11-30 19:16:09 +01:00
Dominik Schürmann bf43f40222 Re-add string accidentally deleted on merge conflict 2016-11-30 18:58:54 +01:00
Dominik Schürmann 7d7a184f79 Fix account crash on Android 7, fixes #1956 2016-11-30 18:41:11 +01:00
Dominik SchürmannandGitHub b02f50dd22 Merge pull request #1953 from open-keychain/openpgp-signature-result-v4
Openpgp signature result v4
2016-11-30 16:28:16 +01:00
Dominik Schürmann 704151cbed Remove dead code 2016-11-30 16:17:46 +01:00
Dominik Schürmann d90b20f550 Merge tobsbot RecyclerView branch 2016-11-30 15:51:32 +01:00
Dominik Schürmann 47b651e669 Merge branch 'tobsbot-recycler-view-keylist' 2016-11-30 15:17:14 +01:00
Dominik Schürmann 740d3fa72c Small UI alignments 2016-11-30 15:13:34 +01:00
Dominik Schürmann cecacb79e5 Use fastscroll library 2016-11-30 15:07:16 +01:00
Dominik Schürmann efb1868791 Fix merge conflicts 2016-11-30 13:46:50 +01:00
Dominik Schürmann d826e2c32e Merge branch 'import-refactor' 2016-11-30 01:01:22 +01:00
Dominik Schürmann a67e8c6dd6 Inline progress for download and import 2016-11-30 01:00:48 +01:00
Dominik Schürmann 921575ff1e Code cleanup 2016-11-29 23:07:43 +01:00
Dominik Schürmann 6fe0ba829c Show result in Notify after import 2016-11-29 22:46:46 +01:00
Dominik Schürmann 61425d6cf0 More descriptive class name for search fragment 2016-11-29 22:26:49 +01:00
Dominik Schürmann 2e6d0fb05c Fix onAttach deprecation 2016-11-29 22:24:27 +01:00
Dominik Schürmann c23139a3fe Fix import from keyservers using URL Intent 2016-11-29 22:04:21 +01:00
Dominik Schürmann d43d4967e2 Use desktop User-Agent for Facebook to workaround bug 2016-11-22 00:15:12 +01:00
Dominik Schürmann e267c3ca6c Remove waffle.io 2016-11-21 23:23:48 +01:00