moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-18 05:12:16 -05:00
Code Issues Releases Wiki Activity
4,328 Commits 12 Branches 24 Tags 116 MiB
d12d469714
Commit Graph

2269 Commits

Author SHA1 Message Date
Vincent Breitmoser
a81474b7a5 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-05-16 23:30:32 +02:00
Vincent Breitmoser
022fde29ae fix fragment handling in ViewKeyActivity 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-05-16 23:30:32 +02:00
Joey Castillo
2d3f745c36 Removing unused SubkeyChange constructor. 2015-05-13 17:56:18 -04: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
de2006a61f Bugfixes and changes based on feedback 2015-05-13 17:56:12 -04:00
Joey Castillo
28b9068ae0 Adding keytocard flag to SubkeyChange: UI sets this flag to initiate keytocard; operation unsets it and fills in dummyDivert to finish it. 2015-05-13 14:36:34 -04:00
Joey Castillo
d21fb77336 Moving keytocard process into PgpKeyOperation. 2015-05-13 14:36:30 -04:00
Joey Castillo
a0107afd3e Moved checks from fragment to operation, impoved logging. 2015-05-12 17:31:14 -04:00
Joey Castillo
76241e90ad Adding NFC Key to Card operation, accessible from Edit Key activity. 2015-05-12 14:44:26 -04:00
Dominik Schürmann
5c44f84009 3.2.1 2015-05-10 13:16:37 +02:00
Dominik Schürmann
a35594201a Fixing rotate crashes in create key 2015-05-10 13:16:03 +02:00
Dominik Schürmann
e4b7920edc Fix crash with v3 key fingerprints 2015-05-10 12:11:35 +02:00
Dominik Schürmann
0a29f6d3ac Cleanup 2015-05-10 11:52:39 +02:00
Dominik Schürmann
5b1bf888b4 Reformat manifest 2015-05-10 11:15:10 +02:00
Dominik Schürmann
874da746ea Add dontnote to proguard 2015-05-10 10:44:04 +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
Dominik Schürmann
e14a2efcad Fixes and clarifications to app signature (or better certificate) pinning 2015-05-10 03:31:19 +02:00
Dominik Schürmann
6e326fb000 Add self-encrypt for old API 2015-05-10 03:00:42 +02:00
Adithya Abraham Philip
797cd28997 fixed sync on key import, 'me' linked contact crash 2015-05-08 19:05:21 +05:30
Dominik Schürmann
63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann
dad19454e9 Pull from transifex 2015-05-06 14:04:03 +02:00
Vincent Breitmoser
91d500b20d check for fingerprint of any subkey (arguable?) 2015-05-06 11:26:01 +02:00
Dominik Schürmann
a45aaa2277 Fix import of keyring with pub+sec key with same key id 2015-05-06 04:10:27 +02:00
Dominik Schürmann
d2998ea80d Rename for consistency 2015-05-06 03:37:57 +02:00
Dominik Schürmann
8de6589c9d Renaming for consisitency 2015-05-06 03:29:04 +02:00
Dominik Schürmann
f102ae5da5 Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity 2015-05-06 03:26:42 +02:00
Dominik Schürmann
afc91fb918 Switch to new library repos 2015-05-06 00:08:04 +02:00
Dominik Schürmann
f87d21a661 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-05 09:27:07 +02:00
Dominik Schürmann
e3f5c6d01e Cleanup manifest 2015-05-05 09:26:57 +02:00
Dominik Schürmann
855b8c4ef9 Fix nullpointer in file decryption 2015-05-05 09:05:39 +02:00
William Faulk
aba9c884ce revert unneeded changes for short key ID 2015-05-04 17:15:51 -04:00
William Faulk
7e7892ff2e revert unneeded changes for old temp Bluetooth share file 2015-05-04 17:15:10 -04:00
William Faulk
44b47e185d use single file extension 2015-05-04 17:09:59 -04:00
William Faulk
eabc6cd8d4 use TemporaryStorageProvider for Bluetooth Share 2015-05-04 16:49:30 -04:00
William Faulk
af1809eebc Use FILE_EXTENSION constants 2015-05-04 16:46:16 -04:00
William Faulk
be3e52884f Use primary user ID for filename instead of short key ID 2015-05-04 16:46:15 -04:00
William Faulk
6383d19dd3 Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater 2015-05-04 16:46:15 -04:00
William Faulk
b06e7cd737 Fix Bluetooth share without breaking others 2015-05-04 16:46:15 -04:00
Dominik Schürmann
291f95db5a Fix revoked/expired state in decrypt activity 2015-05-04 21:13:07 +02:00
Dominik Schürmann
2583f77f07 Fix cancel/skip in create key wizard 2015-05-04 20:47:19 +02:00
Dominik Schürmann
f3090f2939 Display notify above keyboard in CreateKeyEmailFragment 2015-05-04 15:34:48 +02:00
Dominik Schürmann
2cd1cf9192 Fix email pattern 2015-05-04 15:27:19 +02:00
Dominik Schürmann
e1ca612bc4 Use more simple email validation regex 2015-05-04 14:55:56 +02: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
eb9019c78c Temporary fix for gradle dependency bug 2015-05-04 14:29:47 +02:00
Dominik Schürmann
dedda1603c Fix dublicated code in CreateKeyEmailFragment 2015-05-04 14:19:16 +02:00
Dominik Schürmann
39c610c2d1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-05-04 14:18:10 +02:00
Dominik Schürmann
b726dea244 license header for PgpCertifyOperation 2015-05-04 14:12:42 +02:00
Dominik Schürmann
51bb96742f Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 2015-05-04 14:01:34 +02:00
Dominik Schürmann
4e425495e6 Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade 2015-05-04 13:57:43 +02:00
Dominik Schürmann
aa68c41f5a Fix yubikey strings 2015-05-01 14:48:57 +02:00
Dominik Schürmann
f3870cee29 More nullpointer fixes 2015-05-01 14:44:40 +02:00
Dominik Schürmann
e91dc022fb Fix nullpointer in EncryptKeyCompletionView 2015-05-01 14:36:22 +02:00
Dominik Schürmann
5ad50b99a2 Remove time from key creation display 2015-04-30 19:02:33 +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
Daniel Ramos
e159e619d2 -removed unneeded inputType attribute from xml files (+1 squashed commits) 
Squashed commits:

[ef54e68] -code style fixing
 2015-04-30 00:54:56 +01:00
Vincent Breitmoser
8ab49b0766 fix crash when moving focus from EncryptKeyCompletionView with unknown text 2015-04-28 18:22:26 +02:00
Vincent Breitmoser
cd55871950 display unknown keys red rather than orange 
For an unknown key, there is no indication of the state the key is in.
To indicate both immediate action required, and to make this status
equal to its worst case (rather than *better* than its worst case), the
status is displayed in red.

At some point, we will probably want to download unknown keys
automatically, at which point an unknown key will actually be an error
state. This is an intermediate solution until then.
 2015-04-28 18:22:24 +02:00
Vincent Breitmoser
8717642198 fix "select all" in key list multi-select 2015-04-28 18:22:21 +02:00
Vincent Breitmoser
91b774d223 prevent crashes in EncryptKeyCompletionView 2015-04-27 19:49:54 +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
8dbb82a8b6 profiling says: caching qrCode bitmaps is a good idea 2015-04-27 13:52:38 +02:00
Daniel Ramos
c0fbafde68 -Removed unneeded view references from the fragment class since they are not used outside of createView. 
-cleanup
 2015-04-26 19:11:51 +01:00
Daniel Ramos
08d25f3685 -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) and Lollipop (5.1) phone and everything seems to be preserved as expected. 2015-04-26 18:56:37 +01: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
Dominik Schürmann
9eb98f6eb7 Merge pull request #1225 from vectorijk/SwitchToMaterialDrawer 
update lib MaterialDrawer to latest(2.8.2)
 2015-04-26 01:38:18 +02:00
Dominik Schürmann
4c74dbe11e UI fixes for Android < 5 2015-04-26 01:28:29 +02:00
Dominik Schürmann
4732bc5744 Remove unused decrypt result layout 2015-04-26 00:36:37 +02:00
vectorijk
d0d4149e86 update lib MaterialDrawer to latest(2.8.2) 2015-04-25 15:33:30 -07:00
Dominik Schürmann
c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Dominik Schürmann
f1f0126048 Switch to new support lib version 22.1 2015-04-25 23:40:26 +02:00
Manoj Khanna
ef52a3319a Espresso test for CreateKeyActivity 2015-04-25 18:44:02 +05:30
Dominik Schürmann
5d6eb2930c Update in-app contributor list 2015-04-25 15:10:15 +02:00
Dominik Schürmann
64ca19464b Set different titles when changing in nav drawer 2015-04-25 14:37:55 +02:00
Dominik Schürmann
28da731201 Fix empty screen when clicking on encrypt in details view 2015-04-25 14:15:38 +02:00
Dominik Schürmann
f8af6e3387 Update lib section in about 2015-04-25 14:09:55 +02:00
Dominik Schürmann
933d5402a2 Remove old navigation drawer dependency 2015-04-25 14:06:53 +02:00
Dominik Schürmann
de575a618a Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer 
Switch to MaterialDrawer library
 2015-04-25 13:59:56 +02:00
Vincent Breitmoser
9c174ff71d fix encrypt activity layout 2015-04-24 19:17:08 +02:00
Vincent Breitmoser
96853a15ee revamp decrypt ui 2015-04-24 19:17:05 +02:00
vectorijk
b323fc29c2 Fix #1197 Switch to MaterialDrawer library 2015-04-24 03:22:15 -07:00
vectorijk
3ee2c6fc6a Introduce and Switch to mikepenz/MaterialDrawer 2015-04-24 00:00:58 -07:00
Daniel Ramos
40122d61cc Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
 2015-04-24 03:44:57 +01:00
Daniel Ramos
d9cabf8dc4 -Fixed a crash while recreating CreateKeyEmailFragment 
-Email data is properly restored while rotating the Activity.
-Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email.
 2015-04-24 03:35:30 +01:00
Dominik Schürmann
702c28854b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-22 19:00:47 +02:00
Dominik Schürmann
a4e871030d Update changelog 2015-04-22 19:00:18 +02:00
Manoj Khanna
aecebd2ac0 Fixed Snackbar behind layout 
Surrounded string with quotes
 2015-04-22 19:22:12 +05:30
Adithya Abraham Philip
2571d25058 keyserver verification on addition 2015-04-22 06:16:50 +05:30
Adithya Abraham Philip
09cb00a87c corrected possible null pointer 2015-04-22 03:32:59 +05:30
Dominik Schürmann
713f6ba6c7 Simplify ImportKeysProxyActivity 2015-04-21 20:15:10 +02:00
Dominik Schürmann
7d273ecfa6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-21 20:09:52 +02:00
Adithya Abraham Philip
5a4a8f2b6a added log to QR code scan/import fail 2015-04-21 23:16:33 +05:30
Joey Castillo
9d56fc9768 Fix for initialization failure when card returns FCI in data field. 2015-04-20 19:12:01 -04:00
Joey Castillo
104fdcd6bf Track state of PIN verification on smart card; only verify when needed. 2015-04-20 19:11:53 -04:00
Adithya Abraham Philip
91443c2f43 support for handling keyserver urls from browser, added documentation 2015-04-20 21:42:51 +05:30
Dominik Schürmann
7a097dd5df Cleanup in HkpKeyserver 2015-04-20 13:53:00 +02:00
Dominik Schürmann
f2d3abd4c9 Format KeyListFragment 2015-04-18 16:52:02 +02:00
Dominik Schürmann
555b0bf757 Temporarily fix devices without nfc 2015-04-18 16:50:52 +02:00
Dominik Schürmann
b440456acc Use portrait mode for qr code scanning 2015-04-15 10:25:56 +02:00
Dominik Schürmann
e332699c9c More cleanup 2015-04-15 10:10:53 +02:00
Dominik Schürmann
3668c8897d Fix YubiKey naming, cleanup 2015-04-15 10:02:41 +02:00
Dominik Schürmann
f41758261f Clean up NfcOperationActivity 2015-04-15 09:55:29 +02:00
Dominik Schürmann
84deba9886 Reformat nfcVerifyPIN 2015-04-15 09:50:34 +02:00
Joey Castillo
f85befd982 Consolidate PIN verify operation in nfcVerifyPIN method. 2015-04-14 16:19:28 -04:00
Joey Castillo
f981c36bf4 Move PIN verify inside sign/decrypt operation and set correct mode. 2015-04-14 15:34:25 -04:00
Daniel Ramos
d097131a3d -Improved email sanity verifications when adding emails when creating a new Key 
-fixed a few NFC crashes
-fixed a few instances when showing the keyboard would crash the Activity
-fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
 2015-04-14 03:40:59 +01:00
Dominik Schürmann
191784bf4b Update libs 2015-04-14 00:48:45 +02:00
Dominik Schürmann
a545d50f4b Pull from transifex 2015-04-14 00:40:28 +02:00
Dominik Schürmann
b288e5f4fe Update html-textview, fix build 2015-04-14 00:06:05 +02:00
Dominik Schürmann
71024460cb Reformat comment in PassphraseCacheService 2015-04-13 23:53:46 +02:00
Dominik Schürmann
1923942fc9 Buffer ascii armored encryption/signatures 2015-04-13 23:41:16 +02:00
Dominik Schürmann
f12c7b64d8 Merge pull request #1193 from adithyaphilip/auto-refresh-contacts 
Immediate display of contact card, fixed contact picture display issue, hides card if no contact
 2015-04-13 23:33:23 +02:00
Dominik Schürmann
256d644d03 IMplement CryptoInputParcelCacheService 2015-04-13 23:29:35 +02:00
Dominik Schürmann
9fc001c9b9 Clearer var naming 2015-04-12 21:23:59 +02:00
Dominik Schürmann
4a55308741 More simplifications to PassphraseCacheService 2015-04-12 20:12:10 +02:00
Dominik Schürmann
c3d6637e6a Simplify PassphraseCacheService 2015-04-12 19:55:10 +02:00
Dominik Schürmann
2512d3007e Switch to html-textview from JCenter 2015-04-12 18:13:03 +02:00
Dominik Schürmann
7074b44347 Cache CryptoInputParcel in OpenPgpService 2015-04-10 15:58:37 +02:00
Dominik Schürmann
5ea01a15d3 Remove unused AlgorithmNames 2015-04-10 15:21:02 +02:00
Dominik Schürmann
ae4fc47443 Add license headers 2015-04-10 15:20:36 +02:00
Dominik Schürmann
702a77ccd1 Externalize Parcelable caching 2015-04-10 15:16:13 +02:00
Adithya Abraham Philip
083cd100ce hide linked system contact card if no contact present 2015-04-08 01:11:55 +05:30
Adithya Abraham Philip
13332bc28d linked system contact auto-refresh added, fixed contact image issue 2015-04-08 00:30:55 +05:30
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
6c706f8a90 Rename advanced to extended 2015-03-31 10:49:33 +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
Dominik Schürmann
7c258bdedd From passphrase to password 2015-03-31 00:32:48 +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
5052d44b7b Fix scrollbar 2015-03-30 20:48:18 +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
2050be3995 Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of git submodules 2015-03-30 16:08:25 +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
726ff0b501 Fix strings with email address 2015-03-29 21:00:36 +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
eeccd7cd14 3.2beta3 2015-03-23 23:04:35 +01:00
Dominik Schürmann
827d122ab0 translation fixes 2015-03-23 22:38:20 +01:00
Dominik Schürmann
6b164ad8bf Fix language problems reported by yahoe.001 on transifex 2015-03-23 22:18:29 +01:00
Dominik Schürmann
2204195234 Update build env and plugins 2015-03-23 20:17:30 +01:00
Dominik Schürmann
e2f27d0f47 Pull from transifex 2015-03-23 15:54:48 +01:00
Dominik Schürmann
4405e5fbdd Remove remaining html entities in changelog 2015-03-23 15:48:51 +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
78e7e986af Markdown comments 2015-03-23 01:23:42 +01:00
Dominik Schürmann
c3cd96d79f Remove changelog in main folder, update comments 2015-03-23 01:21:26 +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
Vincent Breitmoser
22063cdd6e improve status reporting in yubikey dialogue 2015-03-22 03:34:34 +01:00
Vincent Breitmoser
a7c52a1c9f move yubikey import into viewkeyfragment 2015-03-22 02:36:10 +01:00
Vincent Breitmoser
04c7639a5a split up wait/action yubikey fragments 2015-03-21 22:18:58 +01:00
Vincent Breitmoser
1ad3635d13 work on ad-hoc yubikey import support 2015-03-21 19:52:10 +01:00
Vincent Breitmoser
147003123f first steps toward yubikey activity 
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
 2015-03-21 17:13:35 +01:00
Vincent Breitmoser
9ef2795fcd Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2015-03-21 15:57:35 +01:00
Dominik Schürmann
bf427ce9c1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-03-21 15:43:44 +01:00
Dominik Schürmann
10f9dcd7a1 Add TODO to remote API 2015-03-21 15:43:36 +01:00
Vincent Breitmoser
93c7eb72fb more data in RequiredInputParcel, OperationResult notifications 
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
 2015-03-21 15:16:32 +01:00
Vincent Breitmoser
88ca41d555 add edit key unit test for no-op 2015-03-20 18:55:16 +01:00
Vincent Breitmoser
3e51da3afa fix unit tests (for real) 2015-03-20 18:45:00 +01:00