Commit Graph
31 Commits
Author SHA1 Message Date
Dominik SchürmannandGitHub 5b7851d6e7 Merge pull request #2195 from open-keychain/ccid-check
Change USB filtering
2017-10-28 12:42:43 +02:00
Dominik SchürmannandGitHub 60b970b060 Merge pull request #2186 from open-keychain/apdu-refactor
Refactor OpenPGP applet communication code
2017-10-26 12:26:55 +02:00
Dominik SchürmannandGitHub 07243bcefe Merge pull request #2197 from hagau/fix_npe_dedup
Fix NPE upon dialog dismissal in RemoteDeduplicatePresenter
2017-10-26 12:02:11 +02:00
Dominik SchürmannandGitHub 07b7936d0b Merge pull request #2183 from open-keychain/locate-hotspot
Add "Where is my NFC reader?" button to nfc waiting dialog
2017-10-23 18:37:15 +02:00
Dominik SchürmannandGitHub 992d5fb703 Merge pull request #2190 from wiktor-k/master
Accept dash character (-) in GitHub user names when checking for Gist URL
2017-10-20 13:02:16 +02:00
Dominik SchürmannandGitHub 0b950cae24 Merge pull request #2169 from open-keychain/travis-25
WIP: Travis: use sys-img-armeabi-v7a-android-25
2017-10-16 12:18:56 +02:00
Dominik SchürmannandGitHub ebb6a8d4df Merge pull request #2174 from hagau/update_dependencies
Update support libraries to 25.3.1 and update gradle-witness hashes
2017-10-15 13:13:49 +02:00
Dominik SchürmannandGitHub 51109bdf5c Merge pull request #2182 from open-keychain/usb-refactor
Usb refactoring
2017-10-13 13:44:08 +02:00
Dominik SchürmannandGitHub afed37ed7d Merge pull request #2164 from open-keychain/simplify-cache-ttl
Simplify cache TTL logic
2017-09-20 09:30:29 -10:00
Dominik SchürmannandGitHub ca1bcf93f2 Merge pull request #2162 from open-keychain/clipboard-reformat
Reformat public key blocks when loaded from clipboard
2017-09-20 06:37:11 -10:00
Dominik SchürmannandGitHub 6161d99ca1 Merge pull request #2117 from open-keychain/tls-psk-transfer
Key transfer using TLS-PSK
2017-08-29 20:38:58 +02:00
Dominik SchürmannandGitHub 7a9673fe47 Merge pull request #2145 from open-keychain/ditch-android-beam
Ditch Android Beam feature
2017-08-02 23:45:36 +02:00
Dominik SchürmannandGitHub dd5d57d06c Merge pull request #2143 from nekosune/patch-1
Fix #2080 by adding Javascript
2017-07-28 16:54:39 +02:00
Dominik SchürmannandGitHub 7d6fcf750d Merge pull request #2127 from open-keychain/autocrypt
Autocrypt
2017-07-25 22:58:59 +02:00
Dominik SchürmannandGitHub 1ad0bf1988 Merge pull request #2138 from open-keychain/autovalue-hkp-keyserver
refactor keyserver class structure, use AutoValue for ParcelableHkpKeyserver
2017-07-25 13:32:37 +02:00
Dominik SchürmannandGitHub 3057eaa813 Merge pull request #2122 from af-anssi/fix-secure-messaging
fix issue #2049
2017-06-13 12:08:21 +02:00
Dominik SchürmannandGitHub 02a23a1dd8 Merge pull request #2097 from open-keychain/security-problems
Security Warnings API
2017-05-17 13:52:56 +03:00
Dominik SchürmannandGitHub d8b97c886a Merge pull request #2109 from open-keychain/low-prio-notification
set cache notification to low priority
2017-05-17 12:51:19 +03:00
Dominik SchürmannandGitHub 0b405575c8 Merge pull request #2103 from atsb/master
TYPO: singing replaced to signing
2017-05-11 21:54:19 +03:00
Dominik SchürmannandGitHub b0f343d082 Merge pull request #2088 from open-keychain/dry-run
Use KeychainExternalProvider for resolving encryption keys in api
2017-04-26 15:38:40 +03:00
Dominik SchürmannandGitHub 8738862f09 Merge pull request #2093 from open-keychain/key-status
Key Status Card
2017-04-26 10:45:58 +03:00
Dominik SchürmannandGitHub af478d3b1a Merge pull request #2092 from open-keychain/remove-accounts-api
Remove accounts api
2017-04-26 10:34:08 +03:00
Dominik SchürmannandGitHub 201a4f351f Merge pull request #2066 from open-keychain/db-interactor
Refactor database access
2017-02-27 16:03:52 +01:00
Dominik SchürmannandGitHub 8193cf82b9 Merge pull request #2064 from af-anssi/security-tokens-using-rsa-above-2048
Fix IllegalArgumentException in SecurityTokenUtils #2036
2017-02-17 15:07:10 +01:00
Dominik SchürmannandGitHub 58f01fac4a Merge pull request #2063 from af-anssi/fix-npe-in-cardcapabilities
Fix NPE in CardCapabilities #2000
2017-02-17 14:11:58 +01:00
Dominik SchürmannandGitHub 2c8996bbcd Merge pull request #2052 from open-keychain/lib-init
Initialize libkeychain
2017-02-11 13:25:50 +01:00
Dominik SchürmannandGitHub 84605097cb Merge pull request #2034 from open-keychain/secret-key-selection
redesign access and allowed secret key api dialogs
2017-02-08 02:33:52 +01:00
Dominik SchürmannandGitHub 6b4182d591 Merge pull request #2032 from rhari991/insecure-warning-on-card
Added insecure warning to import card
2017-02-07 20:38:51 +01:00
Dominik SchürmannandGitHub aeb76563c7 Merge pull request #2040 from open-keychain/remove-apg-upgrade
Remove AGP db upgrade
2017-02-07 20:38:29 +01:00
Dominik SchürmannandGitHub d8d1f24cbb Merge pull request #2041 from daquexian/fix_transparent_header
fix transparent header
2017-02-07 20:37:25 +01:00
Dominik SchürmannandGitHub 3f04eb68bb Merge pull request #2039 from open-keychain/upgrade-fix
emergency fix for crashing consolidate
2017-02-07 13:19:27 +01:00