Commit Graph

3752 Commits

Author SHA1 Message Date
Dominik Schürmann a03f6d35d6 Improve way of getting possible names by filtering out emails 2015-03-06 11:14:27 +01:00
Dominik Schürmann f31ada30d0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 10:50:31 +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
chipset95 d83219f3a0 Created EmailEditText, PasswordEditText and implemented wherever required 2015-03-06 11:13:56 +05:30
Dominik Schürmann d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann eaf7e5e005 Fix elevation 2015-03-06 01:12:33 +01:00
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
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
Dominik Schürmann 1576a76ecc Remove false comment in list fragment 2015-03-05 12:53: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
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
Dominik Schürmann e312b0e675 Set key signature algo from SHA512 to SHA256 2015-03-04 20:47:37 +01:00
Dominik Schürmann 484a9371b7 Remove help button for now 2015-03-04 20:40:55 +01:00
Dominik Schürmann 2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann de31fcc45f Partially fix file names 2015-03-04 19:04:15 +01:00
Dominik Schürmann 1aebd7412f Fix transifex 2015-03-04 18:38:58 +01:00
Dominik Schürmann 17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Dominik Schürmann fcc819d437 Update lib list 2015-03-04 15:52:06 +01:00
Dominik Schürmann b662ff6c49 Get high res version of contact photo 2015-03-04 15:39:41 +01:00
Dominik Schürmann 502a0b5376 Crop image view to center 2015-03-04 15:26:09 +01:00
Dominik Schürmann 2389ce9aeb Full height contact pic in key view 2015-03-04 15:23:33 +01:00
Dominik Schürmann 46944198e4 ContactHelper cleanup 2015-03-04 15:12:00 +01:00
Dominik Schürmann ff42dfc9db Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED instead of EXPIRY where possible 2015-03-04 15:02:51 +01:00
Dominik Schürmann b10fe01b82 Fix status bar orange 2015-03-04 11:46:31 +01:00
Dominik Schürmann 9b565f1875 More simplification of delete strings 2015-03-04 11:44:37 +01:00
Dominik Schürmann 8e12e93bc0 Merge pull request #1097 from ishan1604/orange-toolbar
Orange toolbar for certify and fingerprint activity added
2015-03-04 11:40:37 +01:00
Dominik Schürmann 71db34ed75 Simplify certify strings 2015-03-04 11:40:12 +01:00
Dominik Schürmann aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +01:00
Ishan Khanna 0362dc6c1d Orange Toolbar Added Fixes #1088 2015-03-04 15:47:44 +05:30
Vincent c17599f13f Merge pull request #1080 from indrora/avoid-large-log-parcels
Fix root cause of #1077
2015-03-04 00:43:48 +01:00
Dominik Schürmann 9d23b19458 Merge branch 'vectorijk-development' into development 2015-03-03 23:55:19 +01:00