aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* Fix formattingDominik Schürmann2016-05-051-1/+1
|
* Slight amendments for clarityAlex Fong2016-05-051-0/+1
|
* Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵Alex Fong2016-05-051-12/+9
| | | | into ChangeUnlockParcel.
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-8/+10
| | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
* Fix animation in manage keys for security tokensDominik Schürmann2016-04-301-2/+2
|
* OTG: rename Smartcard -> SecurityTokenNikita Mikhailov2016-04-141-17/+16
|
* OTG: refactor, change nfc prefix to smartcardNikita Mikhailov2016-04-141-1/+1
|
* OTG: Refactor persistent connections, namingNikita Mikhailov2016-04-141-1/+1
|
* OTG: Rename 'javacard' package, methods, remove JavacardInterfaceNikita Mikhailov2016-04-141-3/+3
|
* OTG: update methodsNikita Mikhailov2016-04-141-3/+3
|
* Used a constant instead of magic number for colourVictor Hazali2016-04-041-1/+2
| | | | Explicitly stated the blending mode
* Fixes #1298Victor Hazali2016-03-301-0/+2
|
* get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-231-2/+1
|
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-36/+36
| | | | what tokens are supported
* add method to skip cachingVincent Breitmoser2016-01-061-1/+5
|
* (fix accidental use of api level 23 method)Vincent Breitmoser2016-01-051-5/+10
|
* minor fixes to ViewKeyActivityVincent Breitmoser2016-01-051-27/+23
|
* Add change password menu item to view keyDominik Schürmann2015-12-311-11/+94
|
* Improve linked identity handlingDominik Schürmann2015-12-311-16/+6
|
* Add activity to edit user ids onlyDominik Schürmann2015-12-301-13/+0
|
* Add edit action to user id card, left align card actions per material design ↵Dominik Schürmann2015-12-291-4/+3
| | | | guidelines
* Make ContactHelper less staticDominik Schürmann2015-12-211-3/+3
|
* added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-8/+2
|
* Show notification when READ_CONTACTS permission is denied in sync service, ↵Dominik Schürmann2015-11-231-2/+2
| | | | hide linked contact card if permission is denied
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-191-0/+10
|\
| * Merge pull request #1543 from rohands/issue_mouseover_hintsVincent2015-11-161-0/+10
| |\ | | | | | | mouseover hints
| | * Class names and string names are updatedrohands2015-09-221-6/+6
| | |
| | * Updatedrohands2015-09-201-4/+4
| | |
| | * Mousehintsrohands2015-09-201-0/+10
| | |
* | | Check if NFC is available before displaying buttonDominik Schürmann2015-11-191-3/+5
|/ /
* | Properly hide fab in ViewKeyActivity, fixes #1580Dominik Schürmann2015-11-021-5/+28
| |
* | Cleanup, fix advanced sharingDominik Schürmann2015-10-151-4/+2
| |
* | viewkeyactivity: ask for passphrase for backup only if key has oneVincent Breitmoser2015-10-091-3/+29
| |
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-011-1/+1
|\ \
| * | Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-301-1/+1
| |/
* / enc-export: use BackupActivity for backup from ViewKeyActivityVincent Breitmoser2015-09-301-7/+8
|/
* linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-061-1/+2
|
* linked: basic shared element transitionVincent Breitmoser2015-09-061-6/+15
|
* Show linked identity menu item and linked identities only when feature is ↵Dominik Schürmann2015-08-291-1/+2
| | | | enabled
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-5/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-161-40/+46
| |
| * fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| |
| * use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-3/+3
| |
| * Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-41/+139
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-194/+71
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-3/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-13/+15
| | | | | |
| * | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-1/+3
| | | | | |