aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-4/+4
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-4/+4
| |\
| * | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-2/+2
| * | finish ui flow for yubikey importVincent Breitmoser2015-03-221-1/+19
| * | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-221-4/+79
| * | first steps toward yubikey activityVincent Breitmoser2015-03-211-0/+1
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-4/+4
|\ \ \ | | |/ | |/|
| * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-231-4/+4
| |/
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-194/+71
|\|
| * Reworked Notify classManoj Khanna2015-03-201-5/+5
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-201-152/+17
| * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-191-40/+51
| * object oriented split user idDominik Schürmann2015-03-161-3/+3
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-3/+10
|\|
| * Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
| * Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
| |\
| | * Check if NFC is available on deviceRaoul2015-03-101-0/+6
| * | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-3/+4
| |/
* | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-13/+15
* | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-1/+3
* | successfully certify linked idsVincent Breitmoser2015-03-081-9/+16
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-44/+80
|\|
| * Merge pull request #1108 from tdjogi010/developmentVincent2015-03-061-38/+74
| |\
| | * Asks Passphrase for key delete/export in ViewKeyActivity.tdjogi010@gmail.com2015-03-061-38/+74
* | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-163/+162
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-33/+28
|\| |
| * | Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-041-4/+5
| |\ \
| | * | #1042 replaced some int constants with enumsDaniel Nelz2015-03-041-4/+5
| | |/
| * | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| * | Get high res version of contact photoDominik Schürmann2015-03-041-1/+1
| * | Crop image view to centerDominik Schürmann2015-03-041-3/+2
| * | Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
| * | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-041-11/+9
| |/
| * Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
| * rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
* | do a TON of UI workVincent Breitmoser2015-03-051-1/+1
* | add linked it to view key context menuVincent Breitmoser2015-03-021-0/+11
|/
* don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
* fix a couple lint errorsVincent Breitmoser2015-02-281-3/+4
* some changes to qr scan logicVincent Breitmoser2015-02-281-6/+46
* pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-281-1/+21
* slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
* transition status color in key viewVincent Breitmoser2015-02-271-3/+30
* show refresh key progress inlineVincent Breitmoser2015-02-271-7/+125
* go to directly to certify screen after nfc importVincent Breitmoser2015-02-271-2/+2
* Simplify delete key dialogDominik Schürmann2015-02-271-2/+0
* Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-36/+24
* Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-251-16/+41