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

489 Commits

Author SHA1 Message Date
Vincent Breitmoser
04fd2eeb79 remove "export to file" code path from export operation 2015-09-26 02:22:32 +02:00
Vincent Breitmoser
99fd1f4c22 preliminary working mime parsing in DecryptListFragment! (beware WIP, here be dragons!) 2015-09-16 00:05:21 +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
Kaladin Light
dd850e5c72 Fixes open-keychain/open-keychain#1515 
Move launcher icons to mipmap
 2015-09-03 13:25:09 -04: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
Dominik Schürmann
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Adithya Abraham Philip
0251f0e416 introduced constants for keyserver sync, fixed sync issue 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
3f8f70b0a9 added sync preferences 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
93d66d39f7 changed orbot notification icons 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
65a993446c reworked keyserversyncadapterservice flow 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
448657602c improved orbot notify, added periodic sync 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
1ef6f883e3 introduced keyserver sync adapter 2015-08-20 21:02:29 +05:30
Dominik Schürmann
dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
Dominik Schürmann
974b7c37d4 Add privacy information to account screen 2015-08-03 15:13:08 +02:00
Adithya Abraham Philip
771d654766 made mSignatureTime optional in CryptoOperationHelper 2015-07-15 07:34:03 +05:30
Adithya Abraham Philip
b61a7d5535 added licenses, cleaned up code, fixed warnings 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
2827b1af16 added retry on upload failure 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
faa66d6140 prevented passphrase caching on revocation 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30
Vincent Breitmoser
5633fcc92f fix symmetric passphrase caching (fixes #1401) 2015-07-08 04:36:43 +02:00
Adithya Abraham Philip
89f017aa9c reformatted code 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
4d81a83baa added proxy support to OperationHelper 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
2402c6d3c7 ensuring code style is preserved 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
f8da3d784b added keyserver/proxy support to certify operation 2015-07-03 20:46:15 +05:30
Dominik Schürmann
195508ed92 Change PIN and Admin PIN after move to key operation 2015-07-02 17:31:01 +02:00
Adithya Abraham Philip
a5257ec71d Merge branch 'master' of github.com:open-keychain/open-keychain 2015-06-30 22:12:16 +05:30
Vincent Breitmoser
d26379da3a make timeout method in PassphraseCacheService more robust against nullpointers 2015-06-30 16:31:02 +02:00
Dominik Schürmann
a9c606d49b Create key wizard for blank YubiKey 2015-06-29 20:48:11 +02:00
Adithya Abraham Philip
f64e1467ad split import and export ops 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
1c6ae48a07 renamed KeychainNewService to KeychainService 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
7bc21b8b9d removed debug logs, added licenses 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
5f170e5819 fixed Certify op 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
0012db1f6d deleted KeychainService 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
2f110344ed migrated Keybase verification 2015-06-27 01:20:23 +05:30
Adithya Abraham Philip
b33004a2f5 migrated consolidation 2015-06-27 01:20:23 +05:30
Adithya Abraham Philip
de4b203150 migrated promote op to KeychainNewService 2015-06-27 01:20:23 +05:30
Adithya Abraham Philip
6e425e95f5 migrated delete op to KeychainNewService 2015-06-27 01:20:23 +05:30
Adithya Abraham Philip
af6a37f02b migrated key creation to KeychainNewService 2015-06-27 01:20:23 +05:30
Adithya Abraham Philip
5a5d66009f added export and upload to KeychainNewService 2015-06-27 01:20:23 +05:30
Adithya Abraham Philip
aa0bd4c9e0 introduced CryptoOperationHelper in ImportKeysActivity 2015-06-27 01:17:01 +05:30
Vincent Breitmoser
dce4503ac5 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-26 02:44:59 +02:00
Vincent Breitmoser
3af5ba0343 fix warnings in PassphraseCacheService 2015-06-26 01:59:11 +02:00
Dominik Schürmann
74cef32d25 Notification: follow design guidelines, fix #1313 2015-06-24 13:08:37 +02:00
Dominik Schürmann
8cd7e29540 New notify icon 2015-06-24 11:35:11 +02:00
moparisthebest
7366f14d32 New all-white status bar icon to fix issue #1356 2015-06-22 22:40:15 -04:00
Vincent Breitmoser
8d1dc940c4 small fix and some cleanup in ServiceProgressFragment 2015-06-22 23:08:03 +02:00
Vincent Breitmoser
870ca3f5c3 minor code style fixes 2015-06-18 02:11:32 +02:00
Vincent Breitmoser
374b21410e Merge branch 'v/instrument' into v/multi-decrypt 
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
 2015-06-17 19:24:07 +02:00
Vincent Breitmoser
04e9137b66 instrument: use contrib drawer methods, respect passphrase cache 2015-06-17 18:53:05 +02:00