moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity
2,129 Commits 12 Branches 24 Tags 116 MiB
4aec28c237
Commit Graph

2129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Art O Cathain
d06ba72edc Start on Robolectric integration test 2014-06-16 18:58:41 +01:00
Dominik Schürmann
21e9d0b7b4 Merge pull request #656 from danielhass/supertoast-dev 
Added SuperToasts with new notify-wrapper
 2014-06-16 15:20:15 +02:00
Daniel Haß
da28c000ad Changed license header 2014-06-16 13:19:34 +02:00
Daniel Haß
5bd0b5011e Moved Notify class to utils 2014-06-16 13:13:43 +02:00
Daniel Haß
eeff0c7150 Removed unused import 2014-06-16 13:06:42 +02:00
Daniel Haß
76d733cbc7 Added notification area to decrypt content 2014-06-16 12:38:19 +02:00
Daniel Haß
e48d5e4474 Replaced AppMsg with notify wrapper call 2014-06-16 12:37:51 +02:00
Daniel Haß
998f616607 Added notification area as reusable layout 2014-06-16 12:37:37 +02:00
Daniel Haß
41545e5e52 Added notification wrapper for toast like notifys 2014-06-16 12:37:22 +02:00
Dominik Schürmann
81344389e5 Merge pull request #654 from artbristol/master 
Update JUnit version
 2014-06-14 15:54:22 +02:00
Art O Cathain
63861fa60b Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error 2014-06-14 13:16:39 +01:00
Vincent Breitmoser
9d77790729 Merge branch 'canonicalize' 2014-06-13 00:33:13 +02:00
Vincent Breitmoser
ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser
073433fa74 canonicalize: require primary key binding certificates for signing subkeys 2014-06-12 23:10:44 +02:00
Vincent Breitmoser
79131be5f0 canonicalize: simplify import with info from canonicalization 2014-06-12 22:27:32 +02:00
Vincent Breitmoser
0594d9156e canonicalize: filter out future and local certificates 2014-06-12 21:57:03 +02:00
Vincent Breitmoser
9dd40b7238 import-log: more minor improvements 2014-06-12 21:12:21 +02:00
Vincent Breitmoser
59701250ba import: use wrapped keyring instead of uncached keyring for trust 2014-06-12 18:11:31 +02:00
Vincent Breitmoser
e4a7d4f6e5 import-log: minor improvements 2014-06-12 18:10:48 +02:00
Vincent Breitmoser
dae503284f canonicalize: more stuff 2014-06-12 17:38:48 +02:00
Vincent Breitmoser
466eddb005 canonicalize: implementation, first draft 2014-06-12 15:47:21 +02:00
Vincent Breitmoser
dea98a4a7e import-log: properly distinguish return states 2014-06-12 12:36:58 +02:00
Vincent Breitmoser
47368f1d24 import-log: better way to check self trust, and fix log level filtering 2014-06-12 01:37:49 +02:00
Vincent Breitmoser
8d75d3e00e import-log: use holder pattern in log fragment 2014-06-11 00:37:23 +02:00
mar-v-in
e106079b90 Delete using Document API (unsafe) 2014-06-10 21:53:02 +02:00
mar-v-in
f55bc41682 Use Document API on KitKat for file encrypt/decrypt 2014-06-10 20:57:48 +02:00
Vincent Breitmoser
3895c10a58 import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
Vincent Breitmoser
f38556cab1 import-log: switch to flags instead of statuses for result int 2014-06-10 16:24:04 +02:00
Vincent Breitmoser
e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser
eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser
7324bfcb53 import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
Vincent Breitmoser
d73a3e2fa8 import-log: use supertoast in ImportKeyActivity 2014-06-10 01:52:38 +02:00
Vincent Breitmoser
cdc61c4392 canonicalize: first step(s) 2014-06-10 01:51:16 +02:00
Vincent Breitmoser
067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Vincent Breitmoser
97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
Dominik Schürmann
70d454785f Update example code instructions 2014-06-09 22:51:13 +02:00
Dominik Schürmann
2b825c8df7 Update README for build tools 2014-06-09 22:30:12 +02:00
Dominik Schürmann
73a825a152 Really fix travis 2014-06-09 22:14:30 +02:00
Dominik Schürmann
cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 2014-06-09 22:09:30 +02:00
Dominik Schürmann
de6fe46eca Fix travis for buildTools 19.1 2014-06-09 22:02:04 +02:00
Dominik Schürmann
fe1b8468a1 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
Dominik Schürmann
d530a7b0ee Update buildTools to 19.1 2014-06-09 21:52:17 +02:00
mar-v-in
08d63340c9 Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
Dominik Schürmann
90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann
a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann
d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
Dominik Schürmann
341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
mar-v-in
5601f1b76f Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
mar-v-in
55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
Vincent Breitmoser
c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00