Commit Graph
3805 Commits
Author SHA1 Message Date
Vincent Breitmoser 159b197930 add linked id certs uri to KeychainProvider 2015-03-09 21:03:27 +01:00
Vincent Breitmoser 138773798a fix transition animation 2015-03-09 16:56:10 +01:00
Vincent Breitmoser 08fd2a2de3 use loader in LinkedIdViewFragment 2015-03-09 16:30:13 +01:00
Vincent Breitmoser 99eb8725e9 successfully certify linked ids 2015-03-08 04:42:19 +01:00
Vincent Breitmoser b57bcefe08 return key ids from PassphraseDialogActivity, accept null userids 2015-03-08 04:41:41 +01:00
Vincent Breitmoser ea7068acdf minor changes, add convertFingerprintToKeyId method 2015-03-08 03:12:26 +01:00
Vincent Breitmoser 2b5023a75d Merge branch 'development' into linked-identities
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2015-03-08 01:49:22 +01:00
Vincent Breitmoser 4f11fb5a2f unit test certification of user attributes 2015-03-08 01:46:31 +01:00
Vincent Breitmoser 30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Vincent Breitmoser 581cad5b3f work on certification step 2015-03-08 00:59:16 +01:00
Vincent Breitmoser 9e930f0a10 finish after linked id creation 2015-03-06 17:12:49 +01:00
Vincent Breitmoser 5840e9d2b6 use final fragment superclass for twitter 2015-03-06 17:12:49 +01:00
Vincent Breitmoser 73ba19460b use final fragment superclass for dns 2015-03-06 17:12:49 +01:00
Vincent Breitmoser 088282483f extract linked id create final fragment superclass 2015-03-06 17:12:45 +01:00
Vincent Breitmoser a3ac2738ea prepare superclass extraction for final linked id creation fragment 2015-03-06 16:24:48 +01:00
Vincent Breitmoser 6e17d5244d first steps in ui towards confirmation of linked ids 2015-03-06 14:21:13 +01:00
Vincent 443feef27a Merge pull request #1108 from tdjogi010/development
Asks Passphrase for key delete/export in ViewKeyActivity.
2015-03-06 11:10:42 +01:00
Dominik Schürmann a95560c7c4 Merge pull request #1107 from chipset95/issue-1106
EmailEditText, PasswordEditText issue #1106
2015-03-06 10:50:19 +01:00
chipset95 7c2fefe2f7 Added GPLv3 License 2015-03-06 14:47:11 +05:30
tdjogi010@gmail.com 61b306a74a Asks Passphrase for key delete/export in ViewKeyActivity. 2015-03-06 11:50:41 +05:30
chipset95 d83219f3a0 Created EmailEditText, PasswordEditText and implemented wherever required 2015-03-06 11:13:56 +05:30
Dominik Schürmann 0bb3b9c6cc Format code of merged password strength widget 2015-03-05 23:39:41 +01:00
Dominik Schürmann a321131ed5 Merge branch 'passphrase-strength-indicator' into development 2015-03-05 23:30:01 +01:00
Dominik Schürmann 23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
2015-03-05 23:29:43 +01:00
Vincent Breitmoser a2419aa688 work on LinkedIdViewFragment 2015-03-05 18:05:48 +01:00
Dominik Schürmann e50eda4e29 Use ArrayList instead of LinkedList 2015-03-05 17:59:53 +01:00
Dominik Schürmann 02084ba14a Cleanup of PgpConstants 2015-03-05 17:53:14 +01:00
Dominik Schürmann afbb166de6 Add missing header 2015-03-05 17:52:12 +01:00
Dominik Schürmann 3bc3e3e6f4 Check for insecure hash and symmetric encryption algos on decrypt 2015-03-05 17:46:43 +01:00
Dominik Schürmann aeb0169f02 Use static linked lists instead of arrays 2015-03-05 17:24:56 +01:00
Dominik Schürmann 0300bce41f Add missing file with PGP Constants 2015-03-05 16:58:15 +01:00
Dominik Schürmann e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Dominik Schürmann 8b7684baf7 Remove preferences multi process min sdk check 2015-03-05 15:12:59 +01:00
Vincent Breitmoser 5d2c81d715 make linked identity list homogeneous 2015-03-05 13:13:43 +01:00
Dominik Schürmann 1576a76ecc Remove false comment in list fragment 2015-03-05 12:53:51 +01:00
Vincent Breitmoser 7b3bc4ca98 Merge branch 'development' into linked-identities
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
2015-03-05 12:10:51 +01:00
Dominik Schürmann 7ccdd7d38e Debug options 2015-03-05 11:14:19 +01:00
Dominik Schürmann 18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +01:00
Dominik Schürmann c0aabbeb3c Use no compression in API for now 2015-03-05 10:56:27 +01:00
Dominik Schürmann c121657c2c Better selection of preferred algorithm 2015-03-05 10:49:57 +01:00
Vincent Breitmoser 98ce06dbc9 small fixes to the matcher 2015-03-05 10:42:17 +01:00
Vincent Breitmoser 9798ef7bfd fixed length identifiers 2015-03-05 02:10:44 +01:00
Vincent Breitmoser 1f324be243 do a TON of UI work 2015-03-05 01:58:36 +01:00
Dominik Schürmann 8c8fdd6c49 Merge pull request #1101 from danielnelz/development
#1042 replaced some int constants with enums
2015-03-04 22:05:55 +01:00
Dominik Schürmann 0706bca8c6 Rewording secret_key_deletion_confirmation 2015-03-04 21:14:37 +01:00
Dominik Schürmann f3af54c814 Show fingerprint menu item only if not revoked or expired 2015-03-04 21:12:52 +01:00
Daniel Nelz fe8b08ac84 #1042 replaced some int constants with enums
Created enum FragAction in CreateKeyActivity.java and enum State in
KeyFormattingUtils.java and replaced int constants with them
2015-03-04 21:07:32 +01:00
Dominik Schürmann 7c8f338297 Use material save icon 2015-03-04 20:57:11 +01:00
Dominik Schürmann 83a7090681 Merge branch 'adithyaphilip-development' into development 2015-03-04 20:54:23 +01:00
Dominik Schürmann bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2015-03-04 20:54:11 +01:00