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

662 Commits

Author SHA1 Message Date
Vincent Breitmoser
b2dec85421 multi-decrypt: use indeterminate progress only 2015-06-22 14:27:18 +02:00
Vincent Breitmoser
09da00d800 drop clipboard backwards compatibility for api level < 11 2015-06-20 05:08:49 +02:00
Vincent Breitmoser
25beeaceb5 more work on decrypt fragment ux 2015-06-20 03:22:26 +02:00
Vincent Breitmoser
36f3887c5f handle empty filename in decrypt list 2015-06-19 20:09:04 +02:00
Vincent Breitmoser
ae56f4f900 handle EXTRA_TEXT in decrypt activity 2015-06-19 19:45:27 +02:00
Vincent Breitmoser
0cfbe4ad06 Merge branch 'master' into v/multi-decrypt 2015-06-18 13:19:44 +02:00
Vincent Breitmoser
7c3518a011 more stable nullable behavior in OperationLog 2015-06-18 13:16:38 +02:00
Vincent Breitmoser
7f3154ecea Merge branch 'master' into v/multi-decrypt 2015-06-17 21:33:31 +02:00
Vincent Breitmoser
f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +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
655cdfbbee Merge pull request #1338 from josecastillo/development 
Improved smart card error handling
 2015-06-12 15:00:16 +02:00
Joey Castillo
cda8b63bb4 Replace AssertionErrors with snackbar notifications, fix style issues. 2015-06-11 11:52:09 -04:00
Joey Castillo
14226461c1 Improved smart card error handling 2015-06-10 20:11:55 -04:00
Vincent Breitmoser
cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
 2015-06-07 00:05:14 +02:00
Vincent Breitmoser
b779211f55 Merge branch 'master' into v/multi-decrypt 
this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-06-06 23:40:22 +02:00
Vincent Breitmoser
074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Vincent Breitmoser
6db9de221c multi-decrypt: working context menu 2015-06-03 16:47:46 +02:00
Vincent Breitmoser
7cfc0d80d0 Merge branch 'v/sticky-prefs' 2015-06-03 01:23:51 +02:00
Vincent Breitmoser
cf5fadae76 implement sticky preferences 2015-05-31 05:18:58 +02:00
Adithya Abraham Philip
93f3a98eae prevent keybase key replacing keyserver key 2015-05-31 02:49:11 +05:30
Adithya Abraham Philip
cfeffef80d prevent NaN dialog on import with no selected keys 2015-05-31 02:36:45 +05:30
Vincent Breitmoser
36ecd60c1b better error handling for bad encrypted data checksum 2015-05-30 13:09:09 +02:00
Vincent Breitmoser
724726a4fd warn on signature earlier than key creation, err on significantly earlier 2015-05-28 11:40:35 +02:00
Vincent Breitmoser
a8e95f676e don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes 2015-05-28 02:27:44 +02:00
Dominik Schürmann
ab63fa8091 Fix language based on feedback from transifex 2015-05-21 10:31:46 +02:00
Dominik Schürmann
0f520975e4 Improve strings 2015-05-19 16:12:04 +02:00
Vincent Breitmoser
4885361cd2 check fingerprint length after scanning qr code 
Fixes #1281
 2015-05-17 10:37:03 +02:00
Vincent Breitmoser
c1e7fcf024 apply promote operation to specific subkeys present on yubikey only 2015-05-17 00:35:10 +02:00
Joey Castillo
aa75534e5b Moving blank smart card messages to strings.xml 2015-05-13 17:56:17 -04:00
Joey Castillo
bc48ce4210 Add check for exporting two keys to same smart card slot. 2015-05-13 17:56:17 -04:00
Joey Castillo
d21fb77336 Moving keytocard process into PgpKeyOperation. 2015-05-13 14:36:30 -04:00
Joey Castillo
76241e90ad Adding NFC Key to Card operation, accessible from Edit Key activity. 2015-05-12 14:44:26 -04: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
57f72996e8 linked-ids: rename "cookie" to "token" 2015-05-09 12:29:43 +02:00
William Faulk
b06e7cd737 Fix Bluetooth share without breaking others 2015-05-04 16:46:15 -04:00
Dominik Schürmann
520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
 2015-05-04 14:42:21 +02:00
Dominik Schürmann
aa68c41f5a Fix yubikey strings 2015-05-01 14:48:57 +02:00
Dominik Schürmann
c88d2e42b7 Fix key creation string and display 2015-04-30 18:57:51 +02:00
Dominik Schürmann
7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Vincent Breitmoser
fc61208ce7 small ui niceties 2015-04-27 19:49:42 +02:00
Vincent Breitmoser
4ba2e4bcdd display creation dates for ambiguous user ids 2015-04-27 17:46:10 +02:00
Vincent Breitmoser
40834d1fcd add distinct status for messages signed by "your" key 2015-04-27 17:46:07 +02:00
Vincent Breitmoser
32db4e393b display creation dates for ambiguous user ids 2015-04-27 17:45:50 +02:00
Vincent Breitmoser
0ad66eb510 add distinct status for messages signed by "your" key 2015-04-27 14:40:52 +02:00
Daniel Ramos
674f377bd4 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-04-26 18:27:07 +01:00
Vincent Breitmoser
1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Vincent Breitmoser
d6d678dae3 update uris and cookie patterns, plus some stylings 2015-04-25 03:40:38 +02:00
Vincent Breitmoser
96853a15ee revamp decrypt ui 2015-04-24 19:17:05 +02:00
Vincent Breitmoser
ca9ab02b7b revamp decrypt ui 2015-04-24 19:00:33 +02:00
Vincent Breitmoser
b12aa63cb3 use CryptoOperationFragment for linked id fragments, and some warning cleanup 2015-04-24 15:44:33 +02:00