aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* use long rather than String to build uris by keyVincent Breitmoser2014-05-2113-37/+33
|
* wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-2123-211/+370
|
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-1472-1048/+2531
|\ | | | | | | | | | | | | | | | | 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
| * Removed unused Toast importDaniel Haß2014-05-111-1/+0
| |
| * Toast replacementDaniel Haß2014-05-111-2/+4
| |
| * Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
| |
| * ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
| |
| * proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-086-148/+189
| |
| * use longsparsearrays instead of hashmaps in that one placeVincent Breitmoser2014-05-081-16/+19
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-083-5/+1
| |\
| | * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-083-5/+1
| | | | | | | | | | | | (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-074-5/+5
| |
| * Remove code for sharing whole key via qr codeDominik Schürmann2014-05-072-129/+16
| |
| * Start app menu item for registered appsDominik Schürmann2014-05-071-4/+24
| |
| * GET_KEY: also return PendingIntent to key viewDominik Schürmann2014-05-072-2/+11
| |
| * Better handling of actionbars backDominik Schürmann2014-05-076-46/+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-075-52/+102
| |\
| | * 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
| | |
| | * ui: purplize edge overscroll glow effectVincent Breitmoser2014-05-071-0/+20
| | |
| * | 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-0616-48/+38
| |
| * ui: apply purple theme (twi is best color)Vincent Breitmoser2014-05-062-2/+2
| |
| * 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
| | |
| * | Fix license headerDominik Schürmann2014-05-051-12/+11
| | |
| * | Merge pull request #603 from timbray/masterDominik Schürmann2014-05-0515-31/+621
| |\ \ | | | | | | | | Adds first level of keybase support
| | * | Per pull-request comments.Tim Bray2014-05-047-45/+52
| | | |
| | * | stupid identation stuffTim Bray2014-04-301-1/+1
| | | |
| | * | tidy up IntentServiceTim Bray2014-04-301-2/+2
| | | |
| | * | Changes should now be in sync with dominikTim Bray2014-04-301-4/+5
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:37:44 +0000