cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,399 Commits 1 Branch 0 Tags
fe7d13c85f37d18b69b3ffcda28829a4e0ce9f14
Commit Graph
1931 Commits
Author SHA1 Message Date
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 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
Adithya Abraham Philip c2c8ee1efd Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-03-02 22:31:13 +05:30
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
Vincent Breitmoser 0846dd2c14 make userattributeadapter superclass of useridsadapter 2015-03-02 17:38:05 +01:00
Dominik Schürmann 69865a6d57 Use index constants in ContactHelper 2015-03-02 15:44:34 +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
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 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
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
Adithya Abraham Philip 23cbd786ea cleaned up log export 2015-02-28 02:11:39 +05:30
Adithya Abraham Philip 960a163185 Merge branch 'development' of https://github.com/open-keychain/open-keychain into development 2015-02-28 01:30:41 +05:30
Adithya Abraham Philip d776bd2888 refined log output 2015-02-28 01:30:17 +05:30
Vincent Breitmoser 2cd7be6373 go to directly to certify screen after nfc import 2015-02-27 18:05:36 +01:00
Dominik Schürmann 11c3436454 Prettify qr code in advanced key view 2015-02-27 01:44:40 +01:00
Dominik Schürmann 4ccd9f9bb1 Uncluttering advanced key view 2015-02-27 01:38:57 +01:00
Dominik Schürmann b90335f901 Simplify delete key dialog 2015-02-27 01:30:32 +01:00
Dominik Schürmann 8230fb1179 Remove unused BadImportKeyDialogFragment 2015-02-27 01:26:26 +01:00
Dominik Schürmann 6dce7c88d8 Merge keybase-proof branch 2015-02-27 01:18:18 +01:00
Vincent Breitmoser 4ff8eca292 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 18:54:00 +01:00
Vincent Breitmoser 55dd6526a6 split up and mark unsafe expiry-related methods 2015-02-26 18:53:42 +01:00