Commit Graph

3576 Commits

Author SHA1 Message Date
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
eed4de9941 Merge branch 'tobsbot-recycler-view' 2016-12-04 20:08:35 +01:00
Tobias Erthal
5cb9de01ad Fixed id offset, minor changes. 2016-12-04 20:02:56 +01:00
Tobias Erthal
ca67c52aa0 Updated 3 files from recycler-view-all 2016-12-04 20:02:49 +01:00
Tobias Erthal
37abe757f0 Check for key status before enabling click events. 2016-12-03 03:45:34 +01:00
Tobias Erthal
848bb01cff Updated SelectSignKeyAdapter.java from recycler-view 2016-12-03 03:45:25 +01:00
Vincent Breitmoser
d93842bdc6 Merge pull request #1920 from open-keychain/text-linkify
auto-linkify text in DisplayTextActivity, if data is signed
2016-12-01 16:42:51 +01:00
Vincent Breitmoser
e9bd8af5d0 break down result handling in OpenPgpService into methods 2016-12-01 13:45:43 +01:00
Tobias Erthal
d7ed998a40 Updated SelectSignKeyAdapter.java from recycler-view 2016-11-30 23:19:11 +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ü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
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
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
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
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
Tobias Erthal
cc6f903794 Removing changes associated to KeyListFragment, they will get their own PR. 2016-09-25 16:24:17 +02:00
Tobias Erthal
00bda3242a Removing changes associated to KeyListFragment, they will get their own PR. 2016-09-25 16:18:44 +02:00
Tobias Erthal
da0218b5b4 Removing changes associated to KeyListFragment, they will get their own PR. 2016-09-25 15:00:38 +02:00
Tobias Erthal
a432d59d2c fixed KeyNotFound bug, cosmetic changes 2016-09-21 20:09:57 +02:00
Tobias Erthal
7c3ac49d55 updated checksums, EditKeyTest 2016-09-20 16:18:43 +02:00
Tobias Erthal
5ec990d436 Added FastScroll capability to KeyListFragment. Removed unnecessary dependency. 2016-09-19 17:55:09 +02:00
Tobias Erthal
fabd30f6b1 RecyclerView now used in remote fragments. Changes made to the cursor model. A bit more recursive, but better readability in my opinion. 2016-09-14 14:47:02 +02:00
Tobias Erthal
1fedf5a9eb minor changes to DisplayLogFragment 2016-09-12 17:47:20 +02:00
Tobias Erthal
bef769e22a fixed several issues, recyclerview now used in DisplayLogFragment, cosmetic changes 2016-09-12 15:31:47 +02:00