aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Add null check when retrieving key ids from contacts apiDominik Schürmann2014-10-021-0/+7
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-2/+1
* package reordering: merge util and helper, there were no real difference; cre...Dominik Schürmann2014-09-171-6/+6
* work on OperationResultParcelVincent Breitmoser2014-09-141-3/+3
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-1/+1
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-1/+1
* remember "show advanced tabs" settingVincent Breitmoser2014-08-311-4/+7
* move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-2/+6
* return some more resultsDominik Schürmann2014-08-201-0/+1
* Optimize importsDominik Schürmann2014-08-051-2/+1
* Fix nullpointer, remove unused window featureDominik Schürmann2014-08-041-1/+0
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-1/+1
* Merge branch 'master' into improve-file-moremar-v-in2014-08-011-58/+17
|\
| * Use darker colorsDominik Schürmann2014-08-011-4/+4
| * move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-311-30/+0
| * fix bug in UploadKeyActivity, minor work on uri handlingVincent Breitmoser2014-07-311-24/+13
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-311-42/+46
|\|
| * Robots like coffee too...Dominik Schürmann2014-07-311-4/+4
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-291-23/+10
| |\
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-1/+1
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-2/+0
| | * use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-21/+10
| * | Use new icons in other key related activites, delete old iconsDominik Schürmann2014-07-281-1/+1
| * | Set visibility at lastDominik Schürmann2014-07-281-3/+3
| * | Use icons in key viewDominik Schürmann2014-07-281-19/+36
| |/
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-011-2/+6
|\|
| * work on edit keyDominik Schürmann2014-06-301-2/+1
| * pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-2/+6
* | Improve file more, Part 1mar-v-in2014-06-221-3/+1
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-0/+13
|\
| * add more progress info from import routineVincent Breitmoser2014-06-161-0/+13
* | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-181-1/+1
|/
* Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-061-1/+12
|\
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-2/+2
| |\
| * | Show keys with android contactsmar-v-in2014-06-051-1/+12
* | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-061-1/+1
* | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-061-10/+77
| |/ |/|
* | neatness refactoringVincent Breitmoser2014-06-041-2/+2
|/
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-141-117/+157
|\
| * GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-071-1/+1
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-071-0/+31
| |\
| | * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| | * ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-071-0/+4
| | * ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-071-0/+26
| * | Clarify languageDominik Schürmann2014-05-071-1/+1
| |/
| * New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-051-116/+125
* | wrapped-key-ring: remove more unneeded methodsVincent Breitmoser2014-05-041-4/+4
|/
* Fix more stringsDominik Schürmann2014-04-191-1/+1
* NotFoundExceptions for all getGeneric-type methodsVincent Breitmoser2014-04-171-40/+48
* Remove some Ids...Dominik Schürmann2014-04-111-7/+4