aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-1/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | small ui nicetiesVincent Breitmoser2015-04-271-1/+7
| | |
| * | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-271-19/+29
| | |
| * | 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
| * | | more (subtle) ui workVincent Breitmoser2015-03-261-1/+17
| | | |
| * | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-113/+105
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-0/+5
| | | | |
* | | | | Experimental word comparisonDominik Schürmann2015-08-271-0/+126
| | | | |
* | | | | Fix theme problemsDominik Schürmann2015-08-181-2/+2
| | | | |
* | | | | Fix theme bugsDominik Schürmann2015-08-121-4/+14
| | | | |
* | | | | Adpt official theme naming schemaDominik Schürmann2015-08-121-2/+2
| | | | |
* | | | | 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
* | | | | Refactor theme selection of dialogsThialfihar2015-07-212-5/+15
| | | | | | | | | | | | | | | | | | | | This makes sure the dark theme also uses dark dialogs.
* | | | | Refactor theme changing to avoid code repetitionThialfihar2015-07-211-0/+60
| | | | |
* | | | | 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".
* | | | | Make header text and tertiary text color themeableThialfihar2015-07-212-6/+10
| | | | |
* | | | | Start moving colors into themesThialfihar2015-07-211-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using attrs instead of fixed colors it will be possible to style everything and also dynamically grab the color where needed in code. This is done with colorEmphasis as an initial test. Also remove several unused colors.
* | | | | Use support.v7.app.AlertDialogDominik Schürmann2015-07-131-1/+1
| | | | |
* | | | | fixed OrbotRequiredDialogActivity not finishing, orbot install dialog styleAdithya Abraham Philip2015-07-031-4/+30
| | | | |
* | | | | reduce code duplicationAdithya Abraham Philip2015-07-031-0/+109
| | | | |
* | | | | reworked keyserver preferences with recyclerviewAdithya Abraham Philip2015-07-025-0/+348
| | | | |
* | | | | instrument: update symmetric testsVincent Breitmoser2015-06-201-2/+2
| | | | |
* | | | | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-171-16/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * | | | | instrument: add helper method for snackbar checkingVincent Breitmoser2015-06-171-16/+7
| | | | | |
* | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-061-13/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml
| * | | | | implement sticky preferencesVincent Breitmoser2015-05-311-13/+25
| | | | | |
* | | | | | 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
| | | | |
* | | | | Use Mode.ALPHANUMERIC for QR codes to save spaceDominik Schürmann2015-05-191-1/+9
| |_|_|/ |/| | |
* | | | 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.
* | | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-271-19/+29
| |_|/ |/| |
* | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
|\ \ \ | | |/ | |/|
| * | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| | |
* | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-221-1/+10
|/ /
* | Added docs for Notify classManoj Khanna2015-03-201-0/+10
| |
* | Reworked Notify classManoj Khanna2015-03-201-124/+72
| |
* | Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
|/ | | | Displays the snackbar above the keyboard on all activities.
* 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
|/
* some changes to qr scan logicVincent Breitmoser2015-02-281-8/+15
|
* fab support for all notify typesVincent Breitmoser2015-02-281-23/+29
|
* small Notify cleanupVincent Breitmoser2015-02-281-24/+2
|
* control flow for moving the fab up with snackbarVincent Breitmoser2015-02-281-2/+37
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 08:49:55 +0000