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

138 Commits

Author SHA1 Message Date
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
Dominik Schürmann
bb89d77665 Version 3.3 2015-06-30 13:36:27 +02:00
Dominik Schürmann
7d05905a7c Update support libs 2015-06-29 15:08:26 +02:00
Vincent Breitmoser
d472e30b4e instrument: update symmetric tests 2015-06-20 20:43:30 +02:00
Vincent Breitmoser
04d2b6a507 use regular runner for most cases 2015-06-17 18:53:50 +02:00
Vincent Breitmoser
8e60ccb650 workaround for coverage bug (for now!) 
see android bug report https://code.google.com/p/android/issues/detail?id=170607
 2015-06-17 18:53:08 +02:00
Vincent Breitmoser
6f47c78981 stash away stuff 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
442aed8a2d update instrumentation test to JUnit4 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
5e4842ab64 fix instrumentation test(s) 2015-06-17 18:51:50 +02:00
Dominik Schürmann
0b3317600b Cleanup in build.gradle 2015-06-16 00:08:17 +02:00
Dominik Schürmann
98ba424576 Fix coveralls 2015-06-11 13:12:45 +02:00
Dominik Schürmann
7f67658de9 Try coveralls support 2015-06-11 12:58:21 +02:00
Dominik Schürmann
b856d82ae2 Jacoco support for local unit tests 2015-06-11 12:54:15 +02:00
Dominik Schürmann
7a5121894e Remove unused deps, fix travis 2015-06-11 00:36:05 +02:00
Dominik Schürmann
6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann
d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 2015-06-11 00:05:13 +02:00
Dominik Schürmann
05fcbcae7b Temporary fix for testDebug 2015-06-10 22:35:06 +02:00
Dominik Schürmann
aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +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
Dominik Schürmann
3c0f82970c Workaround for Samsung Android 4.2 bug 2015-05-10 04:58:44 +02:00
Dominik Schürmann
bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +02:00
Vincent Breitmoser
9aff6c7f85 linked-ids: add certificate pinning, pin twitter api cert 2015-05-09 19:27:33 +02:00
Dominik Schürmann
afc91fb918 Switch to new library repos 2015-05-06 00:08:04 +02:00