aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
...
* | wrapped-key-ring: use CachedKeyRing where possibleVincent Breitmoser2014-05-213-10/+14
| |
* | use long rather than String to build uris by keyVincent Breitmoser2014-05-216-14/+13
| |
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-214-21/+27
| |
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-1449-1068/+1406
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml
| * Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
| |
| * ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-081-3/+0
| |\
| | * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-081-3/+0
| | | | | | | | | | | | (tested and works, closes #569)
| * | Use flat buttons where appropriateDominik Schürmann2014-05-083-14/+10
| |/
| * use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-084-44/+32
| | | | | | | | Closes #616
| * extract generic LoaderFragment superclass from KeyListVincent Breitmoser2014-05-082-61/+88
| |
| * Don't allow certification using keys where primary subkey is strippedVincent Breitmoser2014-05-071-4/+7
| | | | | | | | Closes #596
| * Add applications section to helpDominik Schürmann2014-05-073-3/+3
| |
| * Remove code for sharing whole key via qr codeDominik Schürmann2014-05-072-129/+16
| |
| * GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-071-1/+1
| |
| * Better handling of actionbars backDominik Schürmann2014-05-075-27/+50
| |
| * Design fixes for certification activityDominik Schürmann2014-05-071-44/+43
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-074-52/+82
| |\
| | * ui: use SlidingTabLayout in help activityVincent Breitmoser2014-05-071-20/+30
| | |
| | * small fix for 6aafb3, forgot to commit this lineVincent Breitmoser2014-05-071-0/+1
| | |
| | * ui: purplize searchtext in keylistVincent Breitmoser2014-05-071-0/+3
| | |
| | * display AppMsg warning when no encryption subkey is availableVincent Breitmoser2014-05-071-0/+12
| | |
| | * ui: slight edit icon cosmetics in keylistVincent Breitmoser2014-05-071-0/+4
| | |
| | * ui: move revocation/expiry notes above tab sliderVincent Breitmoser2014-05-072-32/+32
| | |
| * | Clarify languageDominik Schürmann2014-05-072-2/+2
| |/
| * Clarify languageDominik Schürmann2014-05-061-1/+1
| |
| * edit button with imageDominik Schürmann2014-05-061-2/+3
| |
| * Always use section style instead of custom classDominik Schürmann2014-05-061-69/+0
| |
| * Move logic classes for import into own sub-packageDominik Schürmann2014-05-067-276/+11
| |
| * ui: apply purple theme (twi is best color)Vincent Breitmoser2014-05-061-1/+1
| |
| * ui: use textview buttons in decrypt verify dialogueVincent Breitmoser2014-05-062-6/+6
| |
| * ui: use textviews instead of bootstrap buttons in SignEncryptVincent Breitmoser2014-05-062-10/+9
| |
| * Touch view only onceDominik Schürmann2014-05-061-9/+11
| |
| * ui: use primary icon color for certification statusVincent Breitmoser2014-05-061-11/+8
| |
| * ui: show revocation and expiry status on info tabVincent Breitmoser2014-05-061-31/+40
| |
| * ui: subkey view redesignVincent Breitmoser2014-05-051-31/+13
| |
| * ui: remove primary subkey infoVincent Breitmoser2014-05-051-113/+7
| |
| * Merge pull request #609 from Vadiml1024/masterDominik Schürmann2014-05-051-2/+2
| |\ | | | | | | Avoid displaying double 0x before keyid in ViewCertActivity
| | * Avoid displaying double 0x before keyid in ViewCertActivityVadim Lebedev2014-05-021-2/+2
| | |
| * | Merge pull request #603 from timbray/masterDominik Schürmann2014-05-0510-14/+318
| |\ \ | | | | | | | | Adds first level of keybase support
| | * | Per pull-request comments.Tim Bray2014-05-043-11/+17
| | | |
| | * | stupid identation stuffTim Bray2014-04-301-1/+1
| | | |
| | * | can search openkeychain, retrieve & install & use keys from thereTim Bray2014-04-299-12/+310
| | |/
| * / New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-059-276/+776
| |/
* | wrapped-key-ring: remove more unneeded methodsVincent Breitmoser2014-05-041-4/+4
| |
* | wrapped-key-ring: get rid of bc objects in key editorVincent Breitmoser2014-05-044-57/+51
| |
* | wrapped-key-ring: more work on passphrase caching and certificationVincent Breitmoser2014-05-042-49/+22
| |
* | wrapped-key-ring: redesign underlying CachedKeyRingVincent Breitmoser2014-05-041-7/+1
| |
* | wrapped-key-ring: view certifyVincent Breitmoser2014-05-041-17/+5
| |
* | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-041-70/+47
| |