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

847 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
1576a76ecc Remove false comment in list fragment 2015-03-05 12:53:51 +01:00
Dominik Schürmann
18a827eeed Design fixes for decryption screen 2015-03-05 11:06:17 +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
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
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
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
aba6569dd2 Simplify dialogs according to Material Design 2015-03-04 11:36:26 +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
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
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
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
Vincent Breitmoser
7e4c39c79d rescale qr code bitmap in background 2015-03-02 18:44:24 +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
Vincent Breitmoser
1f828528d3 don't reload qr code for identical fingerprint 2015-03-02 17:43:42 +01:00
Vincent Breitmoser
0846dd2c14 make userattributeadapter superclass of useridsadapter 2015-03-02 17:38:05 +01:00
Adithya Abraham Philip
e69ee812d2 supports sub logs in log export 2015-03-01 11:31:46 +05:30
Adithya Abraham Philip
95e9e2ac30 added logging, notify for log export 2015-03-01 02:02:39 +05:30
Vincent Breitmoser
4e29d027af fix a couple lint errors 2015-02-28 17:49:09 +01:00
Adithya Abraham Philip
6a26ea908e Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 21:57:49 +05:30
Vincent Breitmoser
0557e0680e some changes to qr scan logic 2015-02-28 15:58:26 +01:00
Adithya Abraham Philip
94114e35c2 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 14:29:20 +05:30
Vincent Breitmoser
2ae4d6ce05 pass through messenger to certify service from ViewKeyActivity 
the idea here is to handle progress and result of the CertifyActivity
directly in ViewKeyActivity by passing a messenger through to it. this
allows smoother transition from an uncertified to certified state.
 2015-02-28 04:34:08 +01:00
Vincent Breitmoser
f3710b12f6 fab support for all notify types 2015-02-28 02:30:59 +01:00
Vincent Breitmoser
e4d91de8d2 small Notify cleanup 2015-02-28 01:37:57 +01:00
Vincent Breitmoser
6ba03c0f13 clean up warnings in KeyListFragment 2015-02-28 01:32:15 +01:00
Vincent Breitmoser
cc5b0dae06 collapse fab on action selected 
closes #1057
 2015-02-28 01:31:24 +01:00
Vincent Breitmoser
d64b8f47d1 animate FAB to move up and down when a snackbar appears 2015-02-28 01:17:53 +01:00
Dominik Schürmann
fd55cdb08e Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
 2015-02-28 00:39:18 +01:00
Dominik Schürmann
453b67f7a8 Update from transifex 2015-02-28 00:38:53 +01:00
Vincent Breitmoser
9c62c3fd39 control flow for moving the fab up with snackbar 2015-02-28 00:28:20 +01:00
Dominik Schürmann
0669193e75 Simplify MainActivity 2015-02-28 00:22:31 +01:00
Dominik Schürmann
dc38031b4e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:57:00 +01:00
Dominik Schürmann
582caaba97 Reorder advanced key view 2015-02-27 23:56:53 +01:00
Vincent Breitmoser
c46fdef203 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:53:14 +01:00
Vincent Breitmoser
8cfba4c0fb slightly longer color fade duration 2015-02-27 23:52:51 +01:00