Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 2 | -0/+95 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Dont show slinger button in spinner | Dominik Schürmann | 2015-03-30 | 1 | -0/+2 |
| | | |||||
| * | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 1 | -0/+93 |
| | | |||||
| * | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 1 | -0/+279 |
| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | ||||
* | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 1 | -0/+279 |
| | | |||||
* | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 1 | -3/+0 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 5 | -36/+35 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 5 | -36/+35 |
| | | |||||
* | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 3 | -24/+41 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | 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 |
| | | |||||
* | | show certificates for secret keys differently | Vincent Breitmoser | 2015-03-14 | 1 | -6/+5 |
| | | |||||
* | | improve error handling in LinkedIdViewFragment, disable unknown identity ↵ | Vincent Breitmoser | 2015-03-13 | 1 | -1/+3 |
| | | | | | | | | types (for now?) | ||||
* | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 1 | -1/+0 |
| | | |||||
* | | hack loadSystemContact back in | Vincent Breitmoser | 2015-03-10 | 1 | -0/+8 |
| | | |||||
* | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 1 | -3/+37 |
| | | |||||
* | | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 1 | -18/+35 |
| | | |||||
* | | fix transition animation | Vincent Breitmoser | 2015-03-09 | 1 | -1/+1 |
| | | |||||
* | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 3 | -19/+73 |
| | | |||||
* | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 1 | -1/+1 |
| | | |||||
* | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 1 | -2/+2 |
| | | |||||
* | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 1 | -9/+18 |
| | | |||||
* | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 1 | -75/+44 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 6 | -17/+17 |
|\| | | | | | | | | | | | 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 | 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. | ||||
* | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 2 | -79/+123 |
| | | |||||
* | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 3 | -6/+166 |
|/ | |||||
* | 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 |
| |