Vincent Breitmoser
|
a3e7406b3d
|
fix encrypt/decrypt classes
|
2014-09-17 14:32:14 +02:00 |
|
Dominik Schürmann
|
27cc92cbef
|
Dont copy encrypted file to clipboard (dont know how that code ended up there)
|
2014-09-17 14:00:11 +02:00 |
|
Dominik Schürmann
|
d686c55a0a
|
Work on new result handling (WIP)
|
2014-09-17 13:45:16 +02:00 |
|
Dominik Schürmann
|
3defd194aa
|
Merge pull request #859 from timbray/master
Fix construction of algorithmID in Keybase result lists
|
2014-09-16 07:20:04 +02:00 |
|
Tim Bray
|
018ca6abad
|
Fix construction of algorithmID in Keybase result lists
|
2014-09-15 15:11:59 -07:00 |
|
Vincent Breitmoser
|
9dc22ef510
|
start work on encrypt/decrypt test classes
|
2014-09-15 17:21:58 +02:00 |
|
Vincent Breitmoser
|
1f9bbff58d
|
minor fix for passphrase test
|
2014-09-15 14:17:39 +02:00 |
|
Vincent Breitmoser
|
e457d4c909
|
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
|
2014-09-15 14:00:17 +02:00 |
|
Vincent Breitmoser
|
9a3a032d99
|
move LogLevel info into LogType enum
|
2014-09-15 13:59:21 +02:00 |
|
Dominik Schürmann
|
40751bceb5
|
Pull from transifex
|
2014-09-15 10:44:36 +02:00 |
|
Dominik Schürmann
|
943a9c2634
|
ACCESS_NETWORK_STATE no longer needed
|
2014-09-15 10:34:04 +02:00 |
|
Dominik Schürmann
|
deddb09c32
|
Fix build
|
2014-09-15 10:33:15 +02:00 |
|
Dominik Schürmann
|
a8f7bd49e3
|
Update libs
|
2014-09-15 10:22:47 +02:00 |
|
Dominik Schürmann
|
67e572cf4f
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-15 10:20:01 +02:00 |
|
Dominik Schürmann
|
53bc417f8f
|
New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters)
|
2014-09-15 10:19:55 +02:00 |
|
Dominik Schürmann
|
ba7ef28ade
|
Merge pull request #844 from timbray/master
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
|
2014-09-14 11:00:01 +02:00 |
|
Tim Bray
|
d1a26c5748
|
update for new plural origins on ImportKeyListEntry
|
2014-09-13 21:55:41 -07:00 |
|
Tim Bray
|
c13ccda658
|
Keys found on multiple servers are now imported from all of them
|
2014-09-13 21:43:07 -07:00 |
|
Tim Bray
|
7de86a09bc
|
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
|
2014-09-13 21:41:03 -07:00 |
|
Tim Bray
|
e14cf32264
|
Restore Yubikey setting, lost in fumble-fingered merge
|
2014-09-13 21:41:03 -07:00 |
|
Tim Bray
|
1c32d1df88
|
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
|
2014-09-13 21:41:03 -07:00 |
|
Vincent Breitmoser
|
36ef8a9a62
|
work on OperationResultParcel
|
2014-09-14 01:14:58 +02:00 |
|
Dominik Schürmann
|
88bbce831c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-14 00:56:03 +02:00 |
|
Vincent Breitmoser
|
03d103af07
|
pending results are a type of non-success
|
2014-09-14 00:55:50 +02:00 |
|
Vincent Breitmoser
|
760b05273c
|
(forgot a file for previous commit)
|
2014-09-14 00:43:07 +02:00 |
|
Vincent Breitmoser
|
f0e159a372
|
add SignEncryptResult parcel (probably break stuff)
|
2014-09-14 00:33:30 +02:00 |
|
Dominik Schürmann
|
db5d12800c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-14 00:11:28 +02:00 |
|
Dominik Schürmann
|
179f48a4de
|
First work on decrypt
|
2014-09-14 00:11:23 +02:00 |
|
Dominik Schürmann
|
6156600e42
|
Merge pull request #850 from da-kid/master
Fixed pull2refresh bugs
|
2014-09-14 00:08:12 +02:00 |
|
Daniel Albert
|
0625a16cb5
|
Temporary fix for #848, fixed pull2refresh bugs
|
2014-09-13 23:57:54 +02:00 |
|
Dominik Schürmann
|
d5c9021b89
|
Hack to disable overscroll effect of swipe to update
|
2014-09-13 23:08:04 +02:00 |
|
Dominik Schürmann
|
efdfd2544d
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-13 22:55:32 +02:00 |
|
Dominik Schürmann
|
c9fee47fb3
|
Custom actionbar to indicate swipe down effect
|
2014-09-13 22:55:27 +02:00 |
|
Vincent Breitmoser
|
85d0f5b6d5
|
add key id to trailing asym data log msg
|
2014-09-13 22:27:22 +02:00 |
|
Vincent Breitmoser
|
e2675caf23
|
just skip foreign uid certifications during import for now
Related to #836, fix still pending
|
2014-09-13 22:16:35 +02:00 |
|
Dominik Schürmann
|
df21b258ae
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-13 22:16:04 +02:00 |
|
Dominik Schürmann
|
6b90de2489
|
Fix tests
|
2014-09-13 22:16:00 +02:00 |
|
Vincent Breitmoser
|
9475c4d91a
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-13 22:09:12 +02:00 |
|
Vincent Breitmoser
|
ff65733ed3
|
move IS_REVOKED table prefix to the right places
Fixes #849
|
2014-09-13 22:08:53 +02:00 |
|
Dominik Schürmann
|
bcbf96e61b
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-13 22:02:11 +02:00 |
|
Dominik Schürmann
|
be199b844c
|
Cleanup tests
|
2014-09-13 22:02:01 +02:00 |
|
Dominik Schürmann
|
b67b6b7f87
|
Set literal data format tag to UTF8 when encrypting text
|
2014-09-13 21:59:47 +02:00 |
|
Vincent Breitmoser
|
3b8c171ecb
|
very small fix, don't show name on encoding warning
|
2014-09-13 21:47:04 +02:00 |
|
Vincent Breitmoser
|
b9a4148a07
|
Merge remote-tracking branch 'origin/master'
|
2014-09-13 21:43:49 +02:00 |
|
Vincent Breitmoser
|
8a188a79dc
|
log warning on bad uid encoding
|
2014-09-13 21:43:37 +02:00 |
|
Dominik Schürmann
|
9333d34929
|
Cleanup test
|
2014-09-13 21:42:17 +02:00 |
|
Vincent Breitmoser
|
f8677a5f16
|
Merge branch 'result-parcels'
|
2014-09-13 21:32:17 +02:00 |
|
Vincent Breitmoser
|
7b08b18d25
|
some DecryptVerify log refinements
|
2014-09-13 21:29:29 +02:00 |
|
Dominik Schürmann
|
a1323a1a14
|
deactivate screenshots in new PassphraseDialogActivity
|
2014-09-13 21:17:19 +02:00 |
|
Vincent Breitmoser
|
efd9d1626e
|
add a ton of logging to DecryptVerify
|
2014-09-13 21:14:06 +02:00 |
|