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

2577 Commits

Author SHA1 Message Date
Vincent Breitmoser
e4b113701c Merge remote-tracking branch 'origin/master' 2015-07-15 21:14:53 +02:00
Dominik Schürmann
1dafd1b629 Merge pull request #1435 from open-keychain/revocation-on-deletion 
Revocation on deletion
 2015-07-15 17:26:41 +02:00
Adithya Abraham Philip
fe0b083bc5 fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity 2015-07-15 20:16:07 +05:30
Adithya Abraham Philip
771d654766 made mSignatureTime optional in CryptoOperationHelper 2015-07-15 07:34:03 +05:30
Vincent Breitmoser
4cef97be5f update safeslinger lib (closes #1434) 2015-07-15 00:47:41 +02:00
Vincent Breitmoser
2ceec6ff68 fix verification of android support lib (broken in b59be903) 2015-07-14 19:21:25 +02:00
Vincent Breitmoser
d0c389775a Merge remote-tracking branch 'origin/master' 2015-07-14 16:49:12 +02:00
Vincent Breitmoser
b59be903c3 Revert "Use snackbar lib from maven repo" 
This reverts commit bfc57aefa5.

Conflicts:
	OpenKeychain/build.gradle
	settings.gradle
 2015-07-14 14:37:29 +02:00
Adithya Abraham Philip
03a30fe0e3 added revocation tag NO_REASON to all revocations via PgpKeyOperation 2015-07-14 00:02:53 +05:30
Adithya Abraham Philip
c1d2beb559 made PassphraseDialogActivity compatible with null CryptoInputParcel 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
c59196a6f1 upload only public key in revocation 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
8bbc5513d4 corrected DeleteKeyDialogActivity finishing on cancel 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
0cec75fc9d show key name on revoke/delete dialog 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
76500f47a3 made key deletion require double confirmation 2015-07-13 23:34:06 +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
cdd9de99bf allowed operations to modify CryptoInputParcel they receive 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
d1409fd5c8 use only one DeleteDialogActivity 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30
Dominik Schürmann
bfe36019bd Remove unused icon 2015-07-13 18:19:50 +02:00
Dominik Schürmann
56d599dd76 Use support.v7.app.AlertDialog 2015-07-13 13:37:04 +02:00
Adithya Abraham Philip
06091dffa9 check response code for upload error 2015-07-10 23:26:21 +05:30
Dominik Schürmann
47c07aa320 Version 3.4.1 2015-07-09 15:09:39 +02:00
Dominik Schürmann
bceda47d12 Tests not working anymore on travis after using new annotation parameter 
Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0"

This reverts commit 85a47d22f9.
 2015-07-09 13:16:30 +02:00
Dominik Schürmann
2299c03023 Fix strings nitpicks from transifex 2015-07-09 13:09:47 +02:00
Dominik Schürmann
85a47d22f9 Get rid of robolectric workaround by using new annotation in robolectric 3.0 2015-07-09 13:05:16 +02:00
Dominik Schürmann
89f48cc62e Update robolectric, Workaround still needed 2015-07-09 12:57:55 +02:00
Vincent Breitmoser
96dbb9e60c add pseudo-static id property to CryptoOperationHelper 2015-07-09 11:51:38 +02:00
Vincent Breitmoser
3b189fbe31 run queued operations in onViewStateRestored, *after* onActivityCreated 2015-07-09 02:35:54 +02:00
Vincent Breitmoser
7f9cc445fb cryptoophelper: requested code must be saved between instances! 2015-07-09 02:35:22 +02:00
Vincent Breitmoser
a549938b61 multi-decrypt: save currentInputUri state 2015-07-09 02:34:03 +02:00
Vincent Breitmoser
35b9dabcb8 backup: only ask for passphrase for secret keys which have one 2015-07-09 02:33:16 +02:00
Vincent Breitmoser
3c239bfb34 use onResumeFragments instead of onResume for fragment initialization 2015-07-09 01:14:12 +02:00
Vincent Breitmoser
20cebc2788 change wording of export dialog, remove "export secret" checkbox 2015-07-08 17:25:07 +02:00
Vincent Breitmoser
e0cb891a1f Merge remote-tracking branch 'origin/master' 2015-07-08 15:24:30 +02:00
Vincent Breitmoser
6565adc5cc keylist: show delete as icon in multi-select 2015-07-08 15:24:10 +02:00
Vincent Breitmoser
74a4effcd8 hide keyboard before operations, too 2015-07-08 15:23:55 +02:00
Vincent Breitmoser
a74d86c3d8 grey out text color of key creation date for disabled items 2015-07-08 15:14:38 +02:00
Vincent Breitmoser
e51d443154 change title on backstack change in MainActivity 2015-07-08 15:13:58 +02:00
Vincent Breitmoser
d7a7c7310a hide keyboard on crypto error/success 2015-07-08 15:13:44 +02:00
Adithya Abraham Philip
ce3777eafb fixed progress dialog not shown after enable orbot dialog 2015-07-08 18:41:34 +05:30
Adithya Abraham Philip
a038a038c3 fixed QR code scan and serialKeyImport progress 2015-07-08 18:40:17 +05:30
Vincent Breitmoser
eab46df9a3 cleanup KeyListFragment, remove export all keys 2015-07-08 14:53:46 +02:00
Dominik Schürmann
4760f3f260 Fix YubiKey import 2015-07-08 14:14:39 +02:00
Dominik Schürmann
1ffcffae15 Do not ask for passphrase on delete 2015-07-08 13:39:53 +02:00
Dominik Schürmann
d4fbaf9397 Rudimentary backup feature 2015-07-08 13:25:07 +02:00
Dominik Schürmann
7b35f9b07a Merge pull request #1424 from open-keychain/import-proxy 
Shifted proxy logic to ImportKeysListCloudLoader
 2015-07-08 11:41:46 +02:00
Vincent Breitmoser
9eee9acba2 multi-decrypt: add retry mechanism 2015-07-08 05:15:52 +02:00
Vincent Breitmoser
bf2dc8edc3 multi-decrypt: add cancelled state 2015-07-08 04:53:43 +02:00