Commit Graph

5924 Commits

Author SHA1 Message Date
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ürmann
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
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
Dominik Schürmann
bc08d7dda6 Update copyright header 2016-11-21 23:16:36 +01:00
Dominik Schürmann
fe2e4abef9 Fix BindingAdapter warnings 2016-11-21 23:12:06 +01:00
Vincent Breitmoser
8092896f41 update OpenPgpSignatureResult to version 4, support signatureTimestamp 2016-11-21 16:06:03 +01:00
Vincent Breitmoser
52b1016baa update OpenPgpSignatureResult to use enums 2016-11-21 16:05:42 +01:00
Dominik Schürmann
c3c1568de1 Add flattr 2016-11-07 22:27:27 +01:00
Dominik Schürmann
148f3f49bf Remove deprecated incremental option 2016-10-28 15:08:27 +02:00
Dominik Schürmann
0ae3dc7736 Re-enable gradle witness 2016-10-28 15:04:32 +02:00
Dominik Schürmann
e9446308d4 Update dependencies 2016-10-28 15:02:25 +02:00
Dominik Schürmann
c14594d980 Fix NPE in ParcelableHkpKeyserver 2016-10-27 19:30:10 +02:00
Dominik Schürmann
0dbe067ade Resolve merge conflicts 2016-10-27 19:03:37 +02:00
Dominik Schürmann
f242d80c16 UI for onion keyserver, fix preference upgrade 2016-10-27 17:01:22 +02:00
Dominik Schürmann
911fa020c2 Preparations for support of onion keyservers. Refactoring of Keyserver and proxy related classes 2016-10-27 16:19:43 +02:00
Tobias Erthal
8a83b7c92a Assigned ViewHolder ids to section views based on the section's hash code 2016-10-03 13:17:14 +02:00
Tobias Erthal
da543345ee Reintroduce changes made associated with KeyListFragment to new branch. 2016-09-25 17:26:51 +02:00
Andrea Torlaschi
c389e543d0 (WIP) ImportKeys: Check if key is already present and verified 2016-08-28 23:48:08 +02:00
Andrea Torlaschi
c3b1f2dec5 ImportKeys: Set real date even if we don't have an expected date 2016-08-28 22:33:18 +02:00
Dominik Schürmann
bf382ec59d Update PayPal email 2016-08-26 10:01:28 +02:00
Andrea Torlaschi
9714bcc85b ImportKeys: Show refresh button and change text for "Show key" 2016-08-26 00:04:04 +02:00
Andrea Torlaschi
c0c7c8cc62 ImportKeys: Check expected creation date with the real one 2016-08-25 23:50:37 +02:00
Andrea Torlaschi
238e9e6186 ImportKeys: Fix crash when there is only one search result after we downloaded another key in a previous search 2016-08-25 23:32:03 +02:00
Andrea Torlaschi
7abfa313f9 ImportKeys: Move creation date in the top part of the card 2016-08-25 23:25:17 +02:00
Andrea Torlaschi
4d813179c4 ImportKeys: Hide key status icon until key is downloaded 2016-08-25 22:57:11 +02:00
Vincent Breitmoser
a094730690 remove support for "Comment" field 2016-08-25 14:54:18 +02:00
Andrea Torlaschi
d87813a9e9 ImportKeys: Code style 2016-08-24 15:33:11 +02:00
Andrea Torlaschi
781292e38b ImportKeys: Fix start of operation after request of permission, fixes for permissions, refactoring 2016-08-24 15:07:14 +02:00
Andrea Torlaschi
28f2659cc2 ImportKeys: Fix warnings 2016-08-24 12:51:26 +02:00
Andrea Torlaschi
ab3aaf3cb4 ImportKeys: Avoid adding two times the same top fragment 2016-08-24 12:21:43 +02:00
Andrea Torlaschi
702888bbe4 ImportKeys: Add ability to "Show key" instead of "Import" for already imported keys 2016-08-24 12:03:16 +02:00
Andrea Torlaschi
48266fd8e0 ImportKeys: Use the parsed key status and avoid deprecated method 2016-08-24 09:52:13 +02:00
Dominik Schürmann
6a80c51a59 Merge pull request #1923 from nmikhailov/travis_fix
Travis cleanup
2016-08-23 19:02:34 +02:00
Nikita Mikhailov
ebda5e218a Clean up travis 2016-08-23 23:42:20 +07:00
Andrea Torlaschi
097b580d38 ImportKeys: If there is only one key, expand its card automatically 2016-08-23 17:45:53 +02:00
Andrea Torlaschi
c916da790a ImportKeys: Show SearchView automatically 2016-08-23 17:11:08 +02:00
Andrea Torlaschi
1e33cd3a1a ImportKeys: Show single key card for files with only one key 2016-08-23 16:59:42 +02:00