Commit Graph

22 Commits

Author SHA1 Message Date
Vincent Breitmoser
22c65f2ab8 Use Timber instead of Android.Log 2018-01-20 21:32:37 +01:00
Dominik Schürmann
3cc43e9f69 Adapt copyright headers according to CLA 2017-12-15 16:03:36 +01:00
Wiktor Kwapisiewicz
f2cda5dd6c Accept dash character (-) in GitHub user names when checking for Gist URL
GitHub allows dash / minus characters in usernames (e.g. "wiktor-k" or
"open-keychain"). This change extends the regular expression to capture
this missing character.
2017-10-18 21:20:25 +02:00
klemens
bae6391dc0 spelling fixes 2017-01-14 11:38:05 +01:00
Dominik Schürmann
63244a113a Code formatting and package re-structuring 2017-01-05 13:56:09 +01:00
Dominik Schürmann
317f46990f Fix license header 2016-05-12 15:10:44 +03:00
Dominik Schürmann
c8e5395d4e Use cert pinning only if available 2016-04-09 18:34:00 +02:00
Dominik Schürmann
2d762e55da Okhttp3 cleanups, docs, and fix timeouts for default client 2016-04-09 11:53:37 +02:00
Michal Kepkowski
6c2efb0235 okhttp3 2016-03-14 17:41:18 +01:00
Michal Kepkowski
78a30ed207 okHttp 2016-03-04 11:22:14 +01:00
Dominik Schürmann
79db5c0ebe Replace spongycastle with bouncycastle 2016-02-09 00:24:46 +01:00
Dominik Schürmann
67a51cdfe3 Target SDK 23 and related fixes 2015-10-26 20:53:32 +01:00
Vincent Breitmoser
8a1a62692b linked: deprecate unused method, for now 2015-09-10 12:12:35 +02:00
Vincent Breitmoser
ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +02:00
Vincent Breitmoser
df44d9b65c allow linked token without one colon 2015-05-12 11:57:07 +02:00
Vincent Breitmoser
6fe0a55522 rename LinkedIdentity to LinkedAttribute 2015-05-12 11:56:39 +02:00
Vincent Breitmoser
20a6c5ce8a Merge tag 'v3.2.1' into linked-identities
Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
2015-05-11 17:28:34 +02:00
Vincent Breitmoser
92ac2ded10 linked-ids: small compatibility changes 2015-05-11 17:00:45 +02:00
Vincent Breitmoser
9aff6c7f85 linked-ids: add certificate pinning, pin twitter api cert 2015-05-09 19:27:33 +02:00
Vincent Breitmoser
3600cda3bc linked-ids: rename RawLinkedIdentity to UriAttribute 2015-05-09 19:09:09 +02:00
Vincent Breitmoser
57f72996e8 linked-ids: rename "cookie" to "token" 2015-05-09 12:29:43 +02:00
Vincent Breitmoser
4378f8f871 linked-ids: code cleanup, handle all lint errors 2015-05-09 12:24:48 +02:00