Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 12 | -105/+178 |
| | |||||
* | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 12 | -112/+156 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 598 | -1502/+1234 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Merge pull request #1101 from danielnelz/development | Dominik Schürmann | 2015-03-04 | 13 | -70/+85 |
| |\ | | | | | | | #1042 replaced some int constants with enums | ||||
| | * | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 13 | -70/+85 |
| | | | | | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
| * | | Rewording secret_key_deletion_confirmation | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Show fingerprint menu item only if not revoked or expired | Dominik Schürmann | 2015-03-04 | 1 | -9/+12 |
| | | | |||||
| * | | Use material save icon | Dominik Schürmann | 2015-03-04 | 11 | -1/+2 |
| | | | |||||
| * | | Merge branch 'adithyaphilip-development' into development | Dominik Schürmann | 2015-03-04 | 8 | -2/+225 |
| |\ \ | |||||
| | * | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 8 | -2/+225 |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | | corrected code style | Adithya Abraham Philip | 2015-03-04 | 1 | -58/+75 |
| | | | | |||||
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-03-02 | 17 | -41/+104 |
| | |\ \ | | | | | | | | | | | | | | | | into development | ||||
| | * | | | supports sub logs in log export | Adithya Abraham Philip | 2015-03-01 | 1 | -68/+55 |
| | | | | | |||||
| | * | | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 3 | -20/+66 |
| | | | | | |||||
| | * | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 4 | -37/+113 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into development | ||||
| | * \ \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 74 | -835/+1672 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into development | ||||
| | * | | | | | cleaned up log export | Adithya Abraham Philip | 2015-02-28 | 1 | -20/+9 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 37 | -651/+1303 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into development | ||||
| | * | | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
| | | | | | | | | |||||
| | * | | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 835 | -5627/+14491 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 7 | -0/+117 |
| | | | | | | | | | |||||
| * | | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 7 | -16/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 24 | -56/+70 |
| | | | | | | | | | |||||
| * | | | | | | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 222 | -48/+36 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix transifex | Dominik Schürmann | 2015-03-04 | 1 | -12/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 55 | -781/+82 |
| | | | | | | | | | |||||
| * | | | | | | | | Update lib list | Dominik Schürmann | 2015-03-04 | 2 | -34/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 3 | -6/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 2 | -7/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 2 | -8/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | ContactHelper cleanup | Dominik Schürmann | 2015-03-04 | 2 | -34/+41 |
| | | | | | | | | | |||||
| * | | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 9 | -119/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible | ||||
| * | | | | | | | | Fix status bar orange | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | More simplification of delete strings | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1097 from ishan1604/orange-toolbar | Dominik Schürmann | 2015-03-04 | 3 | -2/+33 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Orange toolbar for certify and fingerprint activity added | ||||
| | * | | | | | | | | Orange Toolbar Added Fixes #1088 | Ishan Khanna | 2015-03-04 | 5 | -44/+33 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixes Issue#1088 | Ishan Khanna | 2015-03-04 | 2 | -0/+42 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/development' into development | Ishan Khanna | 2015-03-04 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules | ||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/development' into development | Ishan Khanna | 2015-03-04 | 15 | -65/+79 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Fixed Submodules | Ishan Khanna | 2015-03-04 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Simplify certify strings | Dominik Schürmann | 2015-03-04 | 1 | -11/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 3 | -17/+13 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | 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 'vectorijk-development' into development | Dominik Schürmann | 2015-03-03 | 249 | -44/+71 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 249 | -44/+71 |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development | ||||
| | * | | | | | | | | | | if needed change name options.templ.json | jiangkai | 2015-03-03 | 2 | -1/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 |
| | | | | | | | | | | | |