aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-291-1/+1
|
* Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-5/+5
|
* decryptlist: implement key lookup (wip)Vincent Breitmoser2015-10-231-22/+19
|
* No show key button for RESULT_INVALID_SIGNATURE, CleanupDominik Schürmann2015-09-301-3/+5
|
* multidecrypt: don't pass context to adapterVincent Breitmoser2015-09-161-5/+6
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-1/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then.
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-1/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-0/+5
| | | |
* | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵Dominik Schürmann2015-08-091-28/+78
| | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos
* | | | Update recent decrypt changes to use new theme attributesThialfihar2015-07-211-9/+10
| | | |
* | | | Give key flag colors their own color namesThialfihar2015-07-211-10/+10
| | | | | | | | | | | | | | | | | | | | This removes "bg_gray" and selector_transparent_button.xml, which is unused and the last file to reference "bg_gray".
* | | | instrument: update symmetric testsVincent Breitmoser2015-06-201-2/+2
| | | |
* | | | multi-decrypt: working in principleVincent Breitmoser2015-06-021-2/+161
| | | |
* | | | preserve state in DecryptTextActivityVincent Breitmoser2015-05-281-1/+1
| | | |
* | | | AssertionError instead of RuntimeExceptionDominik Schürmann2015-05-281-1/+1
| | | |
* | | | Change convertFingerprintToHex to use RuntimeExceptionDominik Schürmann2015-05-281-7/+4
| |_|/ |/| |
* | | Fix crash with v3 key fingerprintsDominik Schürmann2015-05-101-1/+10
| | |
* | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then.
* | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-221-1/+10
|/
* Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-041-25/+27
|\ | | | | #1042 replaced some int constants with enums
| * #1042 replaced some int constants with enumsDaniel Nelz2015-03-041-25/+27
| | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
* | More icon naming fixes and designDominik Schürmann2015-03-041-14/+14
|/
* Bigger status icon in key viewDominik Schürmann2015-02-251-16/+41
|
* First work on new key view toolbarDominik Schürmann2015-02-251-16/+32
|
* color experimentsDominik Schürmann2014-10-151-38/+59
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-081-1/+1
|\ | | | | | | development
| * use "Key ID" for beautifyVincent Breitmoser2014-10-081-1/+1
| |
* | New decryption screen UI with modernPGP iconsDominik Schürmann2014-10-081-21/+106
|/
* no monospace for key idsDominik Schürmann2014-09-201-12/+6
|
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-0/+54
|
* Fix sign via APIDominik Schürmann2014-09-181-1/+1
|
* Use key icons in spinnersDominik Schürmann2014-09-171-0/+41
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-0/+333
created ui.util for everything related to formatting