cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,404 Commits 1 Branch 0 Tags
808a9e4f54aeacec3296a6898974906eebb3803b
Commit Graph

160 Commits

Author SHA1 Message Date
Dominik Schürmann
808a9e4f54 Version 3.8.1 2016-01-12 15:18:05 +01:00
Dominik Schürmann
37ad772c39 Version 3.8 2016-01-11 18:33:42 +01:00
Dominik Schürmann
b33d3f1b6c Log test results 2016-01-04 00:02:28 +01:00
Dominik Schürmann
376e02c4b4 Update dependencies 2016-01-03 23:10:30 +01:00
Dominik Schürmann
574d20e0c3 Remove spongycastle pkix dependency to stay below Androids dex limit 2015-12-22 13:34:26 +01:00
Dominik Schürmann
3611200123 Version 3.7 2015-11-24 00:06:00 +01:00
Dominik Schürmann
dd5d3dbf4c Update support libs to 23.1.1 2015-11-13 15:01:51 +01:00
Dominik Schürmann
4a8a4e37d0 Use fixed version of mockito 2015-11-13 14:59:45 +01:00
Dominik Schürmann
0641b9cba6 comment git dependency again 2015-10-29 23:03:11 +01:00
Dominik Schürmann
fbca191c8f update material drawer library 2015-10-29 23:01:16 +01:00
Dominik Schürmann
67a51cdfe3 Target SDK 23 and related fixes 2015-10-26 20:53:32 +01:00
Dominik Schürmann
33fea901e9 Update stickylistheaders, html-textview 2015-10-26 20:25:55 +01:00
Dominik Schürmann
cf28da39c4 Update tokenautocomplete 2015-10-26 20:21:35 +01:00
Dominik Schürmann
ddc0315b45 Update android-patternview, materialtabstrip, floatingactionbutton 2015-10-26 20:09:41 +01:00
Dominik Schürmann
96bed5ef1a Update zxing-android-embedded with new custom activity 2015-10-26 19:58:56 +01:00
Dominik Schürmann
c04c698992 Version 3.6.1 2015-10-26 19:10:23 +01:00
Dominik Schürmann
6a04866ae6 Commit Github tokens 2015-10-26 12:29:05 +01:00
Dominik Schürmann
cddf1d4c48 Version 3.6, Changelog 3.6 2015-10-22 09:25:29 +02:00
Dominik Schürmann
14d193a0f2 Use Github OAuth ID and secret from properties 2015-10-21 21:40:24 +02:00
Vincent Breitmoser
e9fa891606 fix jacoco coverage 2015-10-08 18:01:40 +02:00
Dominik Schürmann
7d9e44afd7 Fix deps verification 2015-09-21 14:11:00 +02:00
Dominik Schürmann
ad2c8867e6 Use more modular Keybase lib with OkHttp wrapper 2015-09-21 12:49:02 +02:00
Vincent Breitmoser
ece06b1933 multidecrypt: use bottom sheet for longclick options 2015-09-16 19:52:26 +02:00
Vincent Breitmoser
3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser
3814ae7d53 Merge branch 'master' into mime4j 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-09-14 16:21:04 +02:00
Vincent Breitmoser
9ac150eae0 linked: fix client secret paste error 2015-09-10 16:29:16 +02:00
Vincent Breitmoser
ceefa96076 linked: move github client id and secret into build vars 2015-09-10 12:10:24 +02:00
Vincent Breitmoser
36f7ef2808 enable incremental and jumboMode for dexing, speeds up process considerably 2015-09-10 11:47:28 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Adithya Abraham Philip
448657602c improved orbot notify, added periodic sync 2015-08-20 21:02:29 +05:30
Dominik Schürmann
931342ae7d Version 3.5.1 2015-08-18 11:21:23 +02:00
Dominik Schürmann
ad7c567f7c Version 3.5 2015-08-17 13:15:19 +02:00
Dominik Schürmann
dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
Dominik Schürmann
0314d36979 Update dependencies 2015-08-10 15:01:27 +02:00
Dominik Schürmann
3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +02:00
Vincent Breitmoser
dc81e0254c use snackbar from repository (again), and update to 2.11.0 
This release merged our pull requests for round corners on tablet for top line,
and nicer dismiss-on-swipe animation.

https://github.com/nispok/snackbar/pull/134
https://github.com/nispok/snackbar/pull/135
 2015-08-07 12:07:39 +02:00
Dominik Schürmann
460f0d5f33 Update libs 2015-08-03 19:09:59 +02:00
Thialfihar
8d2cd33339 Upgrade MaterialDrawer to 3.0.9 2015-07-21 20:56:42 +02:00
Vincent Breitmoser
4cef97be5f update safeslinger lib (closes #1434) 2015-07-15 00:47:41 +02:00
Vincent Breitmoser
2ceec6ff68 fix verification of android support lib (broken in b59be903) 2015-07-14 19:21:25 +02:00
Vincent Breitmoser
b59be903c3 Revert "Use snackbar lib from maven repo" 
This reverts commit bfc57aefa5.

Conflicts:
	OpenKeychain/build.gradle
	settings.gradle
 2015-07-14 14:37:29 +02:00
Dominik Schürmann
47c07aa320 Version 3.4.1 2015-07-09 15:09:39 +02:00
Dominik Schürmann
89f48cc62e Update robolectric, Workaround still needed 2015-07-09 12:57:55 +02:00
Dominik Schürmann
03211c0d6c Version 3.4 2015-07-06 17:20:35 +02:00
Dominik Schürmann
801566bdb1 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-06 11:27:57 +02:00
Dominik Schürmann
e4bd25613c Exclude more files to satisfy proguard 2015-07-06 11:06:10 +02:00
Adithya Abraham Philip
31fac3080e removed NetCipher submodule, copied classes 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
007d02f01b added proxy support, silent right now 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
0883784ce1 added NetCipher as submodule 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
af3868d547 reworked keyserver preferences with recyclerview 2015-07-02 02:30:49 +05:30