Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 1 | -0/+279 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | ||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 5 | -36/+35 |
| | |||||
* | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 1 | -6/+26 |
| | |||||
* | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 |
| | |||||
* | Merge pull request #1101 from danielnelz/development | Dominik Schürmann | 2015-03-04 | 3 | -8/+11 |
|\ | | | | | #1042 replaced some int constants with enums | ||||
| * | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 3 | -8/+11 |
| | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
* | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 1 | -2/+2 |
|/ | |||||
* | 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. | ||||
* | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 1 | -1/+1 |
| | |||||
* | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 1 | -3/+16 |
| | |||||
* | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 3 | -109/+142 |
| | |||||
* | Fix status images in user id adapter | Dominik Schürmann | 2015-02-27 | 1 | -4/+4 |
| | |||||
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -1/+17 |
|\ | |||||
| * | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 1 | -1/+17 |
| | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
* | | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -5/+17 |
| | | | | | | | | keys | ||||
* | | Bigger status icon in key view | Dominik Schürmann | 2015-02-25 | 1 | -2/+2 |
| | | |||||
* | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 3 | -8/+8 |
| | | |||||
* | | Remove tabs in view key | Dominik Schürmann | 2015-02-24 | 4 | -4/+4 |
| | | |||||
* | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 7 | -10/+10 |
| | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | remove unused NonPgpPartException | Vincent Breitmoser | 2015-01-26 | 1 | -12/+0 |
| | | |||||
* | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 1 | -1/+1 |
| | | |||||
* | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 9 | -19/+17 |
| | | |||||
* | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 1 | -1/+6 |
| | | |||||
* | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 1 | -9/+7 |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 1 | -1/+2 |
|/ | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | Fail on unknown key ids on API, Key item design consistency for API | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 |
| | |||||
* | Fix layout of select key adapter | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -1/+10 |
|\ | | | | | | | development | ||||
| * | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -1/+10 |
| | | |||||
* | | Fix color in import list | Dominik Schürmann | 2014-10-25 | 1 | -6/+8 |
|/ | |||||
* | Make the Certify screen a little more self-explanatory | Tim Bray | 2014-10-21 | 1 | -5/+6 |
| | |||||
* | consistency for import UI | Dominik Schürmann | 2014-10-16 | 1 | -5/+27 |
| | |||||
* | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 3 | -10/+3 |
| | |||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 1 | -16/+5 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 3 | -5/+5 |
| | |||||
* | keylist: add safeslinger exchange button to secret keys | Vincent Breitmoser | 2014-10-10 | 1 | -3/+0 |
| | |||||
* | rename certify_key_item to the more appropriate multi_certify_item | Vincent Breitmoser | 2014-10-08 | 1 | -1/+1 |
| | |||||
* | use status icons in public key selection | Dominik Schürmann | 2014-10-05 | 1 | -16/+18 |
| | |||||
* | more layout neatification | Vincent Breitmoser | 2014-10-05 | 1 | -1/+1 |
| | |||||
* | merge key ids in getSelectedCertifyActions | Vincent Breitmoser | 2014-10-04 | 1 | -3/+25 |
| | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 3 | -19/+43 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | Workings on new parcel for key downloads | Dominik Schürmann | 2014-10-04 | 3 | -19/+43 |
| | | |||||
* | | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 1 | -0/+161 |
|/ | |||||
* | fix nullpointer on button push while data is still loading | Vincent Breitmoser | 2014-10-03 | 1 | -0/+3 |
| | | | | fixes #934 | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-10-03 | 1 | -1/+1 |
|\ | |||||
| * | More beautifyKeyIdWithPrefix | Dominik Schürmann | 2014-10-03 | 1 | -1/+1 |
| | | |||||
* | | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 1 | -8/+3 |
|/ | |||||
* | Fix custom key configuration for primary user ids | Dominik Schürmann | 2014-09-21 | 2 | -3/+18 |
| | |||||
* | Feature to change key configuration in create key | Dominik Schürmann | 2014-09-21 | 1 | -0/+9 |
| |