aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-156-8/+14
|
* A simple fix to clear the list of detected keys when parsing key file gives ↵Alex Fong2016-05-071-0/+1
| | | | an error.
* Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+5
| | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-041-10/+38
|\ | | | | Refer to issue #1600 Limit create key options
| * Redesigned subkey creation dialog and changed default key type created to ↵Alex Fong2016-04-011-10/+38
| | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key.
* | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-311-0/+7
| |
* | use new TokenAutoComplete 2.0.7, fixes #1636Vincent Breitmoser2016-03-231-8/+0
|/
* Add donation fragmentDominik Schürmann2016-02-091-0/+20
|
* Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-1/+1
|
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-011-17/+26
|
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-2/+2
| | | | what tokens are supported
* minor fixes to ViewKeyActivityVincent Breitmoser2016-01-051-1/+1
|
* Fix code styleDominik Schürmann2016-01-021-6/+6
|
* Temporary fix for #1636Dominik Schürmann2016-01-011-0/+7
|
* inline subkey editing (wip commit)Vincent Breitmoser2015-12-271-10/+19
|
* extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-273-7/+15
|
* extend-uid: add option icon for edit action modeVincent Breitmoser2015-12-272-11/+9
|
* Use correct logger in LinkedIdsAdapterDominik Schürmann2015-12-221-1/+1
|
* Target SDK 23 and related fixesDominik Schürmann2015-10-261-5/+4
|
* import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadExceptionVincent Breitmoser2015-10-261-15/+36
|
* linked: fix crash on <= lollipopVincent Breitmoser2015-10-251-3/+6
|
* linked: basic shared element transitionVincent Breitmoser2015-09-061-0/+5
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-297-12/+306
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-121-3/+3
| |
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-22/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-8/+8
| | |
| * | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-091-2/+2
| | |
| * | small ui nicetiesVincent Breitmoser2015-04-271-0/+9
| | |
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
| | |
| * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-6/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-242-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
| * | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-301-0/+279
| | | | |
| * | | | even more linked id ui workVincent Breitmoser2015-03-291-3/+0
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-245-36/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | work on certification uiVincent Breitmoser2015-03-151-1/+1
| | | | | |
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-153-24/+41
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | show certificates for secret keys differentlyVincent Breitmoser2015-03-141-6/+5
| | | | | | |
| * | | | | | improve error handling in LinkedIdViewFragment, disable unknown identity ↵Vincent Breitmoser2015-03-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | types (for now?)
| * | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+0
| | | | | | |
| * | | | | | hack loadSystemContact back inVincent Breitmoser2015-03-101-0/+8
| | | | | | |
| * | | | | | add expand item to linked id listVincent Breitmoser2015-03-101-3/+37
| | | | | | |
| * | | | | | filter out unknown linked idsVincent Breitmoser2015-03-101-18/+35
| | | | | | |
| * | | | | | fix transition animationVincent Breitmoser2015-03-091-1/+1
| | | | | | |
| * | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-093-19/+73
| | | | | | |
| * | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-1/+1
| | | | | | |
| * | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-2/+2
| | | | | | |
| * | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-9/+18
| | | | | | |
| * | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-051-75/+44
| | | | | | |
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-056-17/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | | do a TON of UI workVincent Breitmoser2015-03-052-79/+123
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 06:27:03 +0000