Vincent Breitmoser
145e793db1
forgot to rename a method
2015-03-02 18:20:02 +01:00
Vincent Breitmoser
bccdae2a40
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-02 18:09:09 +01:00
Vincent Breitmoser
23464e7a89
some cleanup in ViewKey*
2015-03-02 18:09:00 +01:00
Dominik Schürmann
7127c2205e
README: mac os x workaround
2015-03-02 17:54:59 +01:00
Vincent Breitmoser
817afffecc
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-03-02 17:44:50 +01:00
Vincent Breitmoser
1f828528d3
don't reload qr code for identical fingerprint
2015-03-02 17:43:42 +01:00
Dominik Schürmann
dae0873f5e
Search string simplified
2015-03-02 17:39:30 +01:00
Vincent Breitmoser
0846dd2c14
make userattributeadapter superclass of useridsadapter
2015-03-02 17:38:05 +01:00
Dominik Schürmann
3c7c278ef3
Use gradle witness
2015-03-02 17:23:06 +01:00
Dominik Schürmann
058f792566
Update readme for build system
2015-03-02 16:34:56 +01:00
Dominik Schürmann
9514719719
Re-add black color
2015-03-02 16:29:40 +01:00
Dominik Schürmann
84e5ac4b03
Remove supertoast dependency
2015-03-02 16:25:12 +01:00
Dominik Schürmann
c1130c5b3e
Removed unused submodules
2015-03-02 16:24:26 +01:00
Dominik Schürmann
505140ef2a
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
Dominik Schürmann
d5cc359a5d
Revert "Gradle hack to always use same build tools in subprojects"
...
This reverts commit fab60f2ddb
.
2015-03-02 15:49:29 +01:00
Dominik Schürmann
fab60f2ddb
Gradle hack to always use same build tools in subprojects
2015-03-02 15:46:41 +01:00
Dominik Schürmann
69865a6d57
Use index constants in ContactHelper
2015-03-02 15:44:34 +01:00
Vincent Breitmoser
4e29d027af
fix a couple lint errors
2015-02-28 17:49:09 +01:00
Vincent Breitmoser
0557e0680e
some changes to qr scan logic
2015-02-28 15:58:26 +01:00
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
c8f5dc5cf3
Strings: File size
2015-02-28 00:56:04 +01:00
Dominik Schürmann
cec7cb3620
Fix strings based on transifex reports
2015-02-28 00:51:58 +01:00
Vincent Breitmoser
67093ccba2
forgot to commit FabContainer
2015-02-28 00:40:11 +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
1c91be84af
Upload new keys to keyserver by default
2015-02-28 00:11:34 +01:00
Dominik Schürmann
0b49becaa8
padding fixes for key list
2015-02-28 00:04:15 +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
Dominik Schürmann
f2a9a41840
Enable multi line snackbar option
2015-02-27 23:47:15 +01:00
Dominik Schürmann
200d4a6bb6
Remove swipte to refresh src, fix padding in key list
2015-02-27 23:39:36 +01:00
Dominik Schürmann
b1c8fa3471
Fix keyboard overlay bug on top of edittexts
2015-02-27 23:24:04 +01:00
Vincent Breitmoser
aec9bdfc1e
transition status color in key view
2015-02-27 23:10:02 +01:00
Vincent Breitmoser
863f4e6ac1
hand through result in CertifyFingerprintActivity
2015-02-27 23:09:17 +01:00
Dominik Schürmann
5b1d834f91
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-02-27 22:47:43 +01:00
Dominik Schürmann
fd2f858b12
Fix status images in user id adapter
2015-02-27 22:47:39 +01:00
Vincent Breitmoser
80c159056d
show refresh key progress inline
2015-02-27 22:46:48 +01:00
Dominik Schürmann
fe31883f66
Keybase header text
2015-02-27 22:40:52 +01:00
Dominik Schürmann
54e04f496e
Better qr code resizing
2015-02-27 22:26:11 +01:00
Vincent Breitmoser
2cd7be6373
go to directly to certify screen after nfc import
2015-02-27 18:05:36 +01:00
Dominik Schürmann
ea4ca9e686
Prettify qr code cleanup
2015-02-27 01:47:06 +01:00