Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 2 | -13/+9 |
| | |||||
* | Merge pull request #1080 from indrora/avoid-large-log-parcels | Vincent | 2015-03-04 | 1 | -6/+63 |
|\ | | | | | Fix root cause of #1077 | ||||
| * | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 |
| | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant. | ||||
| * | Fix root cause of #1077 | Morgan Gangwere | 2015-03-03 | 1 | -6/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.. | ||||
* | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 2 | -2/+2 |
|\ \ | | | | | | | | | | into vectorijk-development | ||||
| * | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 |
| | | | |||||
* | | | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 2 | -1/+25 |
| | | | |||||
* | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 3 | -44/+47 |
| | | | |||||
* | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -24/+25 |
|/ / | |||||
* | | Remove old min sdk check | Dominik Schürmann | 2015-03-03 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #1082 from ishan1604/bug-1081 | Dominik Schürmann | 2015-03-03 | 1 | -3/+0 |
|\ \ | |/ |/| | Fixes Issue #1081 | ||||
| * | Fixes Issue #1081 | Ishan Khanna | 2015-03-03 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Revert "rescale qr code bitmap in background" | Dominik Schürmann | 2015-03-03 | 1 | -6/+7 |
| | | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864. | ||||
* | | Cleanup of contact sync, debugging | Dominik Schürmann | 2015-03-03 | 2 | -94/+126 |
|/ | |||||
* | rescale qr code bitmap in background | Vincent Breitmoser | 2015-03-02 | 1 | -7/+6 |
| | |||||
* | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 2 | -4/+2 |
| | |||||
* | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 2 | -18/+20 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-03-02 | 1 | -7/+20 |
|\ | | | | | | | development | ||||
| * | Use index constants in ContactHelper | Dominik Schürmann | 2015-03-02 | 1 | -7/+20 |
| | | |||||
* | | don't reload qr code for identical fingerprint | Vincent Breitmoser | 2015-03-02 | 1 | -1/+5 |
| | | |||||
* | | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 4 | -115/+143 |
| | | |||||
* | | fix a couple lint errors | Vincent Breitmoser | 2015-02-28 | 2 | -4/+5 |
|/ | |||||
* | some changes to qr scan logic | Vincent Breitmoser | 2015-02-28 | 4 | -37/+113 |
| | |||||
* | pass through messenger to certify service from ViewKeyActivity | Vincent Breitmoser | 2015-02-28 | 4 | -49/+87 |
| | | | | | | 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. | ||||
* | fab support for all notify types | Vincent Breitmoser | 2015-02-28 | 1 | -23/+29 |
| | |||||
* | small Notify cleanup | Vincent Breitmoser | 2015-02-28 | 1 | -24/+2 |
| | |||||
* | clean up warnings in KeyListFragment | Vincent Breitmoser | 2015-02-28 | 1 | -32/+10 |
| | |||||
* | collapse fab on action selected | Vincent Breitmoser | 2015-02-28 | 1 | -0/+3 |
| | | | | closes #1057 | ||||
* | animate FAB to move up and down when a snackbar appears | Vincent Breitmoser | 2015-02-28 | 1 | -11/+10 |
| | |||||
* | forgot to commit FabContainer | Vincent Breitmoser | 2015-02-28 | 1 | -0/+8 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-28 | 3 | -4/+85 |
|\ | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | ||||
| * | control flow for moving the fab up with snackbar | Vincent Breitmoser | 2015-02-28 | 3 | -5/+85 |
| | | |||||
* | | Update from transifex | Dominik Schürmann | 2015-02-28 | 1 | -2/+0 |
|/ | |||||
* | Simplify MainActivity | Dominik Schürmann | 2015-02-28 | 2 | -52/+23 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 2 | -5/+32 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-02-27 | 4 | -172/+9 |
| |\ | | | | | | | | | | development | ||||
| * | | slightly longer color fade duration | Vincent Breitmoser | 2015-02-27 | 1 | -3/+3 |
| | | | |||||
| * | | transition status color in key view | Vincent Breitmoser | 2015-02-27 | 1 | -3/+30 |
| | | | |||||
| * | | hand through result in CertifyFingerprintActivity | Vincent Breitmoser | 2015-02-27 | 1 | -2/+2 |
| | | | |||||
* | | | Reorder advanced key view | Dominik Schürmann | 2015-02-27 | 2 | -59/+7 |
| |/ |/| | |||||
* | | Enable multi line snackbar option | Dominik Schürmann | 2015-02-27 | 1 | -1/+5 |
| | | |||||
* | | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 2 | -167/+0 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-27 | 2 | -8/+131 |
|\| | | | | | | | development | ||||
| * | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 2 | -8/+131 |
| | | |||||
* | | Fix status images in user id adapter | Dominik Schürmann | 2015-02-27 | 1 | -4/+4 |
|/ | |||||
* | Keybase header text | Dominik Schürmann | 2015-02-27 | 1 | -2/+2 |
| | |||||
* | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 4 | -85/+70 |
| | |||||
* | Prettify qr code in advanced key view | Dominik Schürmann | 2015-02-27 | 1 | -7/+23 |
| | |||||
* | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 3 | -250/+0 |
| | |||||
* | Simplify delete key dialog | Dominik Schürmann | 2015-02-27 | 2 | -4/+9 |
| |