aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Commit message (Expand)AuthorAgeFilesLines
* work on edit keyDominik Schürmann2014-06-301-2/+1
* pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-2/+6
* 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
* Refactor ProviderHelper to be non-static using a constructor based on context...Dominik Schürmann2014-04-111-18/+21
* get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredStringVincent Breitmoser2014-04-111-11/+13
* Disable selection of user ids and keys in view keyDominik Schürmann2014-04-101-2/+2
* Minimize use of class variables in ViewKeyDominik Schürmann2014-04-101-6/+6
* Cleanup AsyncTask code for NFCDominik Schürmann2014-04-101-6/+8
* Cleanup importsDominik Schürmann2014-04-101-2/+0
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-101-7/+8
|\
| * Deleted wrong AppMsgDaniel Haß2014-04-101-3/+0
| * Replaced Toasts in ViewKeyActivityDaniel Haß2014-04-091-7/+11
* | Integrate NFC functionality into ViewKeyActivityDominik Schürmann2014-04-101-0/+109
|/
* Introduce ProviderHelper.NotFoundException, remove dead codeDominik Schürmann2014-04-081-23/+38
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+277
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 19:40:47 +0000