aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* minor fixes to ViewKeyActivityVincent Breitmoser2016-01-051-1/+1
|
* extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-271-5/+12
|
* extend-uid: add option icon for edit action modeVincent Breitmoser2015-12-271-10/+8
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-7/+7
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-8/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | hack loadSystemContact back inVincent Breitmoser2015-03-101-0/+8
| | | |
| * | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-4/+5
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+1
| | | |
* | | | Give key flag colors their own color namesThialfihar2015-07-211-1/+1
| |_|/ |/| | | | | | | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray".
* | | object oriented split user idDominik Schürmann2015-03-161-7/+7
| |/ |/|
* | #1042 replaced some int constants with enumsDaniel Nelz2015-03-041-4/+5
|/ | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
* forgot to rename a methodVincent Breitmoser2015-03-021-1/+1
|
* some cleanup in ViewKey*Vincent Breitmoser2015-03-021-3/+16
|
* make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-021-109/+5
|
* Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
|
* Dont show verification icons in my key view, hide edit button for non-secret ↵Dominik Schürmann2015-02-251-5/+17
| | | | keys
* First work on new key view toolbarDominik Schürmann2015-02-251-4/+4
|
* Remove tabs in view keyDominik Schürmann2015-02-241-1/+1
|
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-1/+1
| | | | | | | - 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
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-1/+1
|
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-9/+7
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* More color/icon consistencyDominik Schürmann2014-10-151-4/+1
|
* color experimentsDominik Schürmann2014-10-151-16/+5
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-4/+4
| | | | created ui.util for everything related to formatting
* Add user info dialogDominik Schürmann2014-08-131-20/+5
|
* Better handling of user id revocation in UI codeDominik Schürmann2014-08-051-0/+20
|
* Add user id with dialogDominik Schürmann2014-08-011-8/+13
|
* Use darker colorsDominik Schürmann2014-08-011-2/+2
|
* Robots like coffee too...Dominik Schürmann2014-07-311-2/+2
|
* Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-281-12/+28
|
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-5/+5
|\ | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| * Work on subkeys adapterDominik Schürmann2014-07-081-5/+5
| |
* | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-4/+4
|/
* Work on editDominik Schürmann2014-07-031-12/+10
|
* remove init methods from adapterDominik Schürmann2014-07-021-29/+14
|
* Edit key: adding user idsDominik Schürmann2014-07-021-0/+3
|
* new edit key: first version to add user idsDominik Schürmann2014-06-241-1/+2
|
* new edit key: diff for existing user idsDominik Schürmann2014-06-221-10/+41
|
* Rename adapterDominik Schürmann2014-06-221-0/+244
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 18:30:06 +0000