aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-277/+0
* Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-051-1/+1
* Fix nfc, make edit activity like a modal dialog, move all menu actions into v...Dominik Schürmann2014-04-051-9/+21
* db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-041-5/+6
* db-overhaul: workaround api level 11Vincent Breitmoser2014-04-041-6/+8
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-041-9/+22
|\
| * Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ...Dominik Schürmann2014-04-031-11/+3
| |\
| * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-9/+22
* | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-0/+2
* | | db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-041-1/+3
* | | db-overhaul: more work on new providerVincent Breitmoser2014-04-031-4/+4
* | | more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-031-4/+9
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-1/+0
|\|
| * Rearrange too long linesThialfihar2014-04-021-1/+2
| * Trivial spacing changes to conform to style guideThialfihar2014-04-021-1/+1
| * Adjust import orderThialfihar2014-04-021-1/+0
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-9/+2
|/
* Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-211-16/+3
|\
| * Fix for #410Nikhil Peter Raj2014-03-211-16/+3
* | Fix fingerprint handlingDominik Schürmann2014-03-201-1/+1
|/
* Fix export for new unified key list #409uberspot2014-03-151-2/+5
* final ui code style changesuberspot2014-03-131-1/+1
* More code style fixes for /uiuberspot2014-03-131-1/+2
* First code style changes in uiuberspot2014-03-131-2/+1
* Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-2/+9
|\
| * move some placeholders into resourcesVincent Breitmoser2014-03-081-1/+1
| * Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-081-1/+8
* | Add export... button and functionality in multi-selectuberspot2014-03-111-2/+1
* | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-1/+2
* | use parameter in updateFromKeyserverDominik Schürmann2014-03-081-1/+1
* | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-071-2/+2
|/
* rework key view into fragments to later add certificationsDominik Schürmann2014-02-091-287/+45
* language fixesDominik Schürmann2014-02-081-1/+3
* do not delete pub keys where secret key existsDominik Schürmann2014-02-061-12/+24
* keyserver instead of key serverDominik Schürmann2014-02-051-1/+1
* work on lookup key, fix some illegal state exceptions with hackDominik Schürmann2014-02-041-2/+4
* Certify not sign a key, added as button, does not belong to menuDominik Schürmann2014-02-041-18/+27
* expose key server APIDominik Schürmann2014-02-021-1/+1
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-021-5/+5
* Fix QR Code URIDominik Schürmann2014-02-011-1/+1
* Reworking import, testing needed...Dominik Schürmann2014-02-011-3/+3
* rename KeyServerUploadActivity to UploadKeyActivityDominik Schürmann2014-02-011-1/+1
* Started working on integration of keyserver query into import activityDominik Schürmann2014-02-011-2/+2
* No bouncy castle objects in key viewDominik Schürmann2014-02-011-26/+15
* Fix and simplify user id parsingDominik Schürmann2014-01-311-1/+1
* language fixDominik Schürmann2014-01-291-3/+2
* show unknown in ViewKey if user id is not setDominik Schürmann2014-01-291-2/+7
* Give expiry dates to PgpKeyOperationDominik Schürmann2014-01-291-3/+3
* Use intent data instead of IDs for upload and sign, fixes #205Dominik Schürmann2014-01-291-16/+2
* save keyring in-place, fixes #228, #203Dominik Schürmann2014-01-291-155/+160