moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-10 11:05:06 -05:00
Code Issues Releases Wiki Activity
3,994 Commits 12 Branches 24 Tags 116 MiB
a467480717
Commit Graph

1658 Commits

Author SHA1 Message Date
Dominik Schürmann
a467480717 Fix signing subkey selection in remote service 2015-04-07 13:49:34 +02:00
Dominik Schürmann
8e5d0d1682 Fix nullpointer with Intent API, fix clearing of encrypt file list, notify when adding a range of input uris 2015-04-04 19:01:03 +02:00
Vincent Breitmoser
ad69622b69 fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) 2015-04-01 00:39:32 +02:00
Dominik Schürmann
cc44ff1a8b Prepare decrypt UI for input parcel 2015-03-31 15:44:37 +02:00
Dominik Schürmann
c37e7ef241 Better check if file is already added 2015-03-31 01:53:37 +02:00
Dominik Schürmann
ce3a1f4c33 Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel 2015-03-31 00:32:56 +02:00
Vincent Breitmoser
8bd8267a47 work on passphrase data flow 2015-03-31 00:28:24 +02:00
Dominik Schürmann
aea52f2e6f Simplify passphrase dialog design 2015-03-31 00:24:08 +02:00
Vincent Breitmoser
6cc7b6141a update OpenPgpApi, re-add EXTRA_PASSPHRASE 2015-03-30 23:56:09 +02:00
Vincent Breitmoser
19ecd5f427 Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
 2015-03-30 23:42:38 +02:00
Vincent Breitmoser
b0a51e7dd3 remove unused NfcActivity 2015-03-30 23:39:36 +02:00
Vincent Breitmoser
39b131c7e5 fix Encrypt* with RequiredInputParcel 2015-03-30 23:35:32 +02:00
Dominik Schürmann
d67b546ec5 Dont show slinger button in spinner 2015-03-30 23:23:54 +02:00
Dominik Schürmann
a3276a4485 Use RecyclerView in EncryptFilesFragment 2015-03-30 20:41:29 +02:00
Vincent Breitmoser
d7b79e55fb pass CryptoInputParcel independently for SignEncryptOperation 2015-03-30 16:40:41 +02:00
Dominik Schürmann
91494dd3a3 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
 2015-03-30 15:53:44 +02:00
Vincent Breitmoser
dcaac4f85f rewrite EncryptKeyCompletionView with generalized KeyAdapter 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
 2015-03-30 02:45:49 +02:00
Dominik Schürmann
7ffb55faaa Merge branch 'development' into v/crypto-input-parcel 2015-03-29 21:00:06 +02:00
Dominik Schürmann
95f1527afe Fixing crashes with new encrypt ui 2015-03-29 20:37:54 +02:00
Dominik Schürmann
6b48ddd717 Merge pull request #1188 from adithyaphilip/import-message-error 
Corrected import error message, changed style to WARN
 2015-03-28 18:11:26 +01:00
Adithya Abraham Philip
1af522cf35 changed style to WARN, corrected error message 2015-03-28 19:47:54 +05:30
Daniel Ramos
605c9ace58 -Fixed a situation where additional emails could be duplicated when creating a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. 2015-03-27 23:15:27 +00:00
Dominik Schürmann
b82f273284 Start reworking decrypt ui classes 2015-03-27 00:55:55 +01:00
Dominik Schürmann
13f4cc4ad3 Refactoring of EncryptTextActivity 2015-03-27 00:40:37 +01:00
Dominik Schürmann
f62a5eded4 Merge branch 'development' into v/crypto-input-parcel 2015-03-26 22:48:06 +01:00
Dominik Schürmann
76db0b3b8e Start refactoring encrypt ui, EncryptFileActivity no longer crashing 2015-03-26 11:04:20 +01:00
iseki
621e7401a8 Modify break as return. 2015-03-26 12:18:41 +09:00
iseki
59a446d7f4 Add brackets for if-else constructs and externalize the procedure as showMultiExportDialog. 2015-03-26 11:59:18 +09:00
Dominik Schürmann
1ef63f3187 Fix certify with CryptoInputParcel 2015-03-25 11:12:52 +01:00
Dominik Schürmann
5e024bba2e Remove backward compat in CertifyKeyFragment 2015-03-25 10:50:55 +01:00
iseki
e83532cb19 Add a loop for multiple key export. 2015-03-25 04:44:53 +09:00
Dominik Schürmann
040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
 2015-03-24 13:19:43 +01:00
Dominik Schürmann
e2f27d0f47 Pull from transifex 2015-03-23 15:54:48 +01:00
Dominik Schürmann
95639f2720 Merge pull request #1165 from kentnek/dev-yubikey-null 
Fixed #1152: NullPointerException when signing with YubiKey
 2015-03-23 15:39:16 +01:00
Dominik Schürmann
54cd414693 Merge pull request #1166 from adithyaphilip/multi-threaded 
Multi-threaded key import, update all feature
 2015-03-23 15:38:57 +01:00
Dominik Schürmann
aa3565b857 Fix passphrase cache not clearing all passphrases 2015-03-23 15:38:02 +01:00
Dominik Schürmann
30711c3fe7 Merge pull request #1174 from Jesperbk/development 
Fixed symmetric encryption crash
 2015-03-23 13:01:10 +01:00
JesperBK
5bdac11ef8 Fixed issue where setting a passphrase to null later causes a NullPointerException. 2015-03-23 11:17:01 +01:00
Adithya Abraham Philip
9f5581463f shifted multi-threading to own service 
added multi-threaded cloud import, restored KeychainIntentService

eliminated code duplication in multi-threaded import
 2015-03-23 15:37:05 +05:30
Adithya Abraham Philip
19775c399b introduced multi-threading 
refactored oldKeys to updatedKeys

added update all keys, ThreadPoolExecutor

used modified CachedThreadPoolExecutor
 2015-03-23 15:34:22 +05:30
Vincent Breitmoser
c694d73cab further improve yubikey error handling 2015-03-23 01:48:44 +01:00
Dominik Schürmann
633b64fd95 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-23 01:11:17 +01:00
Dominik Schürmann
b3a599f214 Use markdown for in-app help 2015-03-23 01:11:11 +01:00
Vincent Breitmoser
3bb194fc08 nicer handling of nfc errors 2015-03-23 01:09:39 +01:00
Vincent Breitmoser
5227b45af8 Merge branch 'development' into v/crypto-input-parcel 2015-03-22 22:21:19 +01:00
Vincent Breitmoser
8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +01:00
Vincent Breitmoser
5d5e06cabd fix unit test and add new for divert-to-card promotion 2015-03-22 07:21:27 +01:00
Vincent Breitmoser
2e838e4cce enable nfc in import dialog as well 2015-03-22 06:48:33 +01:00
Vincent Breitmoser
212bba1869 finish ui flow for yubikey import 2015-03-22 06:36:27 +01:00
Vincent Breitmoser
2151411219 actually promote to divert, pass yubikey's AID 2015-03-22 03:58:01 +01:00