cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,091 Commits 1 Branch 0 Tags
612c0719c04d3b7391357ce3530eeec2ab688439
Commit Graph
3147 Commits
Author SHA1 Message Date
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 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 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 2bfe355d44 More icon naming fixes and design 2015-03-04 20:03:20 +01:00
Dominik Schürmann 17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +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
Vincent Breitmoser 8222315dbd work more on separation of linked identities and resources, initial ui work 2015-03-04 12:30:56 +01:00
Dominik Schürmann aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +01:00
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 1cc860d23f Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development 2015-03-03 23:46:20 +01:00
Adithya Abraham Philip 024ba19499 corrected code style 2015-03-04 04:14:28 +05:30
Dominik Schürmann c00a1f1ec3 Show name only in passphrase dialog 2015-03-03 23:43:25 +01:00
Lukas Zorich 438314c4bb Integrates passphrase strength indicator to create key wizard. 
This commit patches issue #1050. The padding set in the passphrase edit
text is set programmatically because there is a bug in appcompat-v7
where padding via xml doesn't work:

http://code.google.com/p/android/issues/detail?id=77982
 2015-03-03 18:52:10 -03:00
Lukas Zorich 7f9c663033 Add license to password strength view classes 2015-03-03 18:51:06 -03:00
Dominik Schürmann 7b0e067f63 Fix expiry dialog, reorder layouts 2015-03-03 22:44:32 +01:00
Dominik Schürmann 188559bbcd Prettify passphrase dialog, it no longer resizes on unlocking the key 2015-03-03 22:27:14 +01:00
jiangkai f195055107 icon name changes in UI files 2015-03-03 12:19:00 -08:00
Lukas Zorich 2443bc9f5d Implemented Matt Allen password strength indicator 
I used most of Matt Allen password strength indicator code available
here https://github.com/matt-allen/android-password-strength-indicator,
but modified it a little bit in order to customize the view's colors
through the xml.
 2015-03-03 16:23:43 -03:00
Morgan Gangwere ba5eb3543e Cleanup for style 
Some nitpicks were had. Also, change the null UUID to a constant.
 2015-03-03 08:47:16 -07:00
Dominik Schürmann 2ea0f609f2 Remove old min sdk check 2015-03-03 13:16:56 +01:00
Dominik Schürmann 199ff610e0 Merge pull request #1082 from ishan1604/bug-1081 
Fixes Issue #1081
 2015-03-03 11:21:28 +01:00
Ishan Khanna 06d76ccd0c Fixes Issue #1081 
The App crashed because the Adapter was trying to call a method on a
null object.

Where was the null object?
CheckBox was null because in the Layout file
view_key_adv_user_id_item.xml

There is no such widget with id = user_id_item_check_box

Fix :
I removed the two lines which were causing the bug, and now the screen
loads perfectly.
 2015-03-03 14:46:28 +05:30
Morgan Gangwere 73a1ceb732 Fix root cause of #1077 
When importing lots of keys, lots of messages about the status of keys
is generated, including some debug slime and general fluff that
isn't really needed a lot of the time. As a result, a serious bug can come
along after key imports or certain operations which cause a log to become
parceled.

This commit implements a pool to "dehydrate" logs into: they are placed
into the pool (a ConcurrentHashMap) and a UUID assigned to them, which
is parceled along. When the OperationResult is un-parceled, it reads in
the appropriate UUID bits and rehydrates the appropriate log.

In order to avoid any memory leaks, the log pool removes a reference to
the log itself, allowing the log to die a natural death at the hands
of the GC..
 2015-03-03 00:51:44 -07:00
Dominik Schürmann d3f54d3ace Revert "rescale qr code bitmap in background" 
size of view may not be available in background thread.

This reverts commit 7e4c39c79d.
 2015-03-03 00:26:36 +01:00
Dominik Schürmann 363d41ed1d Cleanup of contact sync, debugging 2015-03-03 00:26:15 +01:00
Vincent Breitmoser d4df509a1d remove unused bits from projection 2015-03-02 20:59:07 +01:00
Vincent Breitmoser e059b5550c nonce is 4 bytes 2015-03-02 20:40:37 +01:00
Vincent Breitmoser 8bec183eda add linked it to view key context menu 2015-03-02 19:05:52 +01:00
Vincent Breitmoser 7e4c39c79d rescale qr code bitmap in background 2015-03-02 18:44:24 +01:00
Vincent Breitmoser e6af789bf5 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
 2015-03-02 18:34:51 +01:00
Vincent Breitmoser 145e793db1 forgot to rename a method 2015-03-02 18:20:02 +01:00
Vincent Breitmoser 23464e7a89 some cleanup in ViewKey* 2015-03-02 18:09:00 +01:00