aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* some code cleanup in PreferencesVincent Breitmoser2016-01-061-10/+16
* inline-ttl: support "screen off" in preferenceVincent Breitmoser2016-01-062-8/+9
* passcache: add support for clear on screen lock (ttl == 0)Vincent Breitmoser2016-01-061-36/+70
* inline-ttl: use ttl preference in ttl spinnerVincent Breitmoser2016-01-063-32/+25
* inline-ttl: save changes in ttl settingsVincent Breitmoser2016-01-062-25/+60
* inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-067-40/+409
* passdialog: seconds field and some minor layout issuesVincent Breitmoser2016-01-061-1/+1
* passphraseactivity: add inline spinner to password dialogVincent Breitmoser2016-01-064-29/+92
* passdialog: switch to ViewAnimatorVincent Breitmoser2016-01-051-11/+8
* (fix accidental use of api level 23 method)Vincent Breitmoser2016-01-051-5/+10
* minor fixes to ViewKeyActivityVincent Breitmoser2016-01-055-57/+41
* Check for ACTION_OPEN_DOCUMENT before starting activityDominik Schürmann2016-01-041-10/+28
* Fallback for ACTION_OPEN_DOCUMENT, hopefully fixes #1625Dominik Schürmann2016-01-041-3/+12
* Fix #1649Dominik Schürmann2016-01-041-4/+7
* Fix code styleDominik Schürmann2016-01-022-6/+8
* Temporary fix for #1636Dominik Schürmann2016-01-012-0/+9
* Merge pull request #1584 from open-keychain/edit-redesignDominik Schürmann2015-12-3116-214/+1623
|\
| * Add change password menu item to view keyDominik Schürmann2015-12-311-11/+94
| * Upload to keyserver after editing identitiesDominik Schürmann2015-12-311-18/+142
| * Improve linked identity handlingDominik Schürmann2015-12-312-66/+85
| * Edit identities designDominik Schürmann2015-12-315-34/+35
| * Add activity to edit user ids onlyDominik Schürmann2015-12-304-20/+449
| * Add edit action to user id card, left align card actions per material design ...Dominik Schürmann2015-12-294-11/+18
| * Load key data in tabs independently from advanced activity. This decouples th...Dominik Schürmann2015-12-293-62/+118
| * use correct white add iconDominik Schürmann2015-12-281-1/+1
| * Advanced screen: edited key savedDominik Schürmann2015-12-282-2/+99
| * Pass trough masterKeyId and fingerprint to advanced key edit fragmentsDominik Schürmann2015-12-273-23/+29
| * inline-edit: move action mode menu handling int activityVincent Breitmoser2015-12-273-62/+135
| * inline subkey editing, fixedVincent Breitmoser2015-12-273-9/+21
| * inline subkey editing (wip commit)Vincent Breitmoser2015-12-274-14/+294
| * extend-uid: use FAB instead of extra list itemVincent Breitmoser2015-12-272-2/+20
| * extended: leave ActionMode on page changeVincent Breitmoser2015-12-271-0/+21
| * extended-share: move qr code resizing into onLayoutChangeListener (+performan...Vincent Breitmoser2015-12-271-8/+39
| * extend-uid: button and list to add user idsVincent Breitmoser2015-12-271-2/+49
| * extend-uid: allow changes to user ids in edit modeVincent Breitmoser2015-12-276-16/+85
| * extend-uid: add option icon for edit action modeVincent Breitmoser2015-12-274-59/+92
| * extended: init tabs with loader infoVincent Breitmoser2015-12-272-11/+14
* | keylist: fix highlighter (fixes #1637)Vincent Breitmoser2015-12-291-24/+19
* | keylist: filter results by all user ids for search (fixes #1645)Vincent Breitmoser2015-12-293-24/+28
|/
* Use correct logger in LinkedIdsAdapterDominik Schürmann2015-12-221-1/+1
* Update spongycastle to 1.53Dominik Schürmann2015-12-223-4/+6
* Backup: Move FAQ button to last screen and simplify codeDominik Schürmann2015-12-221-8/+2
* Cleanup in HelpActivityDominik Schürmann2015-12-221-4/+0
* Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaL...Dominik Schürmann2015-12-222-7/+32
|\
| * Issue #1595aLIEzTed2015-12-222-7/+32
* | Add hint to encrypt fieldDominik Schürmann2015-12-221-4/+0
* | Follow notification style guidelines, dismiss permission notification on clickDominik Schürmann2015-12-223-64/+9
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-12-217-45/+78
|\ \
| * | fixed key update preference not turning offAdithya Abraham Philip2015-12-214-45/+59
| * | api: add micalg result extra to detached signature api callVincent Breitmoser2015-12-173-0/+19