aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Better selection of preferred algorithmDominik Schürmann2015-03-0511-40/+99
|
* Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-0413-70/+85
|\ | | | | #1042 replaced some int constants with enums
| * #1042 replaced some int constants with enumsDaniel Nelz2015-03-0413-70/+85
| | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
* | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| |
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-042-2/+203
|\ \ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * | corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| | |
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-021-7/+20
| |\ \ | | | | | | | | | | | | into development
| * | | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| | | |
| * | | added logging, notify for log exportAdithya Abraham Philip2015-03-012-20/+59
| | | |
| * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-284-37/+113
| |\ \ \ | | | | | | | | | | | | | | | into development
| * \ \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2815-380/+375
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into development
| * | | | | cleaned up log exportAdithya Abraham Philip2015-02-281-20/+9
| | | | | |
| * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2824-463/+1033
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into development
| * | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| | | | | | |
| * | | | | | merged dialogAdithya Abraham Philip2015-02-2641-573/+1931
| |\ \ \ \ \ \
| * | | | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+102
| | | | | | | |
* | | | | | | | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
| | | | | | | |
* | | | | | | | More icon naming fixes and designDominik Schürmann2015-03-042-16/+16
| | | | | | | |
* | | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-042-17/+8
| | | | | | | |
* | | | | | | | Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
| | | | | | | |
* | | | | | | | Crop image view to centerDominik Schürmann2015-03-041-3/+2
| | | | | | | |
* | | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
| | | | | | | |
* | | | | | | | ContactHelper cleanupDominik Schürmann2015-03-042-34/+41
| | | | | | | |
* | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵Dominik Schürmann2015-03-049-119/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible
* | | | | | | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 21:29:02 +0000