aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Simplify dialogs according to Material DesignDominik Schürmann2015-03-042-13/+9
|
* Merge pull request #1080 from indrora/avoid-large-log-parcelsVincent2015-03-041-6/+63
|\ | | | | Fix root cause of #1077
| * Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant.
| * Fix root cause of #1077Morgan Gangwere2015-03-031-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ürmann2015-03-032-2/+2
|\ \ | | | | | | | | | into vectorijk-development
| * | icon name changes in UI filesjiangkai2015-03-032-2/+2
| | |
* | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
| | |
* | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-033-44/+47
| | |
* | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-031-24/+25
|/ /
* | Remove old min sdk checkDominik Schürmann2015-03-031-3/+1
| |
* | Merge pull request #1082 from ishan1604/bug-1081Dominik Schürmann2015-03-031-3/+0
|\ \ | |/ |/| Fixes Issue #1081
| * Fixes Issue #1081Ishan Khanna2015-03-031-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ürmann2015-03-031-6/+7
| | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864.
* | Cleanup of contact sync, debuggingDominik Schürmann2015-03-032-94/+126
|/
* rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
|
* forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
|
* some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-021-7/+20
|\ | | | | | | development
| * Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
| |
* | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| |
* | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-024-115/+143
| |
* | fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
|/
* some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
|
* pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-284-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 typesVincent Breitmoser2015-02-281-23/+29
|
* small Notify cleanupVincent Breitmoser2015-02-281-24/+2
|
* clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10
|
* collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
| | | | closes #1057
* animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
|
* forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-283-4/+85
|\ | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-283-5/+85
| |
* | Update from transifexDominik Schürmann2015-02-281-2/+0
|/
* Simplify MainActivityDominik Schürmann2015-02-282-52/+23
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-5/+32
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-02-274-172/+9
| |\ | | | | | | | | | development
| * | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| | |
| * | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| | |
| * | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
| | |
* | | Reorder advanced key viewDominik Schürmann2015-02-272-59/+7
| |/ |/|
* | Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+5
| |
* | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-272-167/+0
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-8/+131
|\| | | | | | | development
| * show refresh key progress inlineVincent Breitmoser2015-02-272-8/+131
| |
* | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
|/
* Keybase header textDominik Schürmann2015-02-271-2/+2
|
* go to directly to certify screen after nfc importVincent Breitmoser2015-02-274-85/+70
|
* Prettify qr code in advanced key viewDominik Schürmann2015-02-271-7/+23
|
* Uncluttering advanced key viewDominik Schürmann2015-02-273-250/+0
|
* Simplify delete key dialogDominik Schürmann2015-02-272-4/+9
|