cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,642 Commits 1 Branch 0 Tags
fcd27d2600711ccd32c000c6d58da19cb816a9bf
Commit Graph
4642 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann 6db7a1af99 Merge pull request #1438 from open-keychain/upload-error 
Check upload response code and throw AddKeyException
 2015-07-13 12:13:53 +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
Dominik Schürmann 17ba1751f1 Merge pull request #1429 from open-keychain/qr-fix 
Fixed QR code import and serialKeyImport progress
 2015-07-08 15:18:25 +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
Vincent Breitmoser 5633fcc92f fix symmetric passphrase caching (fixes #1401) 2015-07-08 04:36:43 +02:00
Adithya Abraham Philip be6b7ff899 shifted proxy checking to ImportKeysListCloudLoader 2015-07-08 07:47:24 +05:30
Vincent Breitmoser 6cbc0ceeae comment for database fix 2015-07-08 03:52:38 +02:00
Vincent Breitmoser 70d94acc58 put encryptdecrypt overview into a scrollview 2015-07-08 03:52:38 +02:00
Dominik Schürmann d98a321f66 Simplifications for expiry dialog 2015-07-08 03:45:36 +02:00
Dominik Schürmann 4837d4cc5c Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-08 03:12:24 +02:00
Dominik Schürmann 15cee8e7e9 Temporary fix for multi export 2015-07-08 03:12:20 +02:00
Vincent Breitmoser af546ae101 apply database fix for bogus rows introduced by issue #1402 2015-07-08 02:55:35 +02:00
Vincent Breitmoser dad2ba0db8 fix expiry check in edit key ui 2015-07-08 02:34:03 +02:00
Vincent Breitmoser c01c71ba68 no progress dialog for bind action in view key / yubikey fragment 2015-07-08 02:30:06 +02:00
Vincent Breitmoser 3af97bf0e6 some cleanup and fix for back button in ImportKeysActivity (fixes #1372) 2015-07-08 02:29:04 +02:00
Vincent Breitmoser 510999c3a2 fix result type for divert-to-card new subkey error 2015-07-08 02:28:05 +02:00
Vincent Breitmoser d9b07625e8 addition of subkeys for divert-to-card primary keys is not supported 2015-07-08 01:42:47 +02:00
Vincent Breitmoser 642f83c1f4 better handling of divert-to-card keys for subkey modifications 2015-07-08 01:41:55 +02:00
Vincent Breitmoser ac2c8f994e (missed a couple files in last commit) 2015-07-08 00:01:39 +02:00
Vincent Breitmoser 587e7d088b use QueueingCryptoOperationFragment in all other places 2015-07-07 23:57:12 +02:00
Vincent Breitmoser 310228f6ba introduce QueueingCryptoOperationFragment to queue result handling in detached state 2015-07-07 23:43:23 +02:00