aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpolDominik Schürmann2016-01-132-61/+28
|\ | | | | Use Nordpol for BaseNfcActivity
| * Use new version of Nordpol from jcenterPetter Arvidsson2016-01-121-1/+1
| | | | | | | | | | - Use version 0.1.13 that is now available on jcenter - Add a "gradle witness" for this version
| * Use Nordpol for BaseNfcActivityPetter Arvidsson2016-01-122-61/+28
| | | | | | | | | | | | | | | | - Replace handling of intents with Nordpol tag dispatcher - Update CreateKeyActivity to pass it's intent to the tag dispatcher when invoked by the system (onCreate) - Add Fidesmo marmeladburk repository - Add dependency on nordpol-android and nordpol-core
* | fix symmetric decryption with backup code (fixes #1677)Vincent Breitmoser2016-01-131-5/+6
|/
* fix symmetric decryption (fixes #1672)Vincent Breitmoser2016-01-121-2/+2
|
* Fix singleTop definitionsDominik Schürmann2016-01-111-16/+2
|
* Merge pull request #1666 from open-keychain/file-import-fixDominik Schürmann2016-01-111-2/+15
|\ | | | | Fixed File Import issue due to onResumeFragments
| * fixed file import issue due to onResumeFragmentsAdithya Abraham Philip2016-01-091-2/+15
| |
* | passphrasecache: update defaults, add "forever" settingVincent Breitmoser2016-01-113-4/+10
| |
* | keycreate: add button to revert to default key configurationVincent Breitmoser2016-01-111-41/+74
| |
* | Move edit key configuration to menuDominik Schürmann2016-01-111-21/+42
| |
* | Error out when editing a stripped keyDominik Schürmann2016-01-111-1/+6
| |
* | Advanced screen, warning fragmentDominik Schürmann2016-01-112-10/+70
| |
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-1025-281/+278
|/ | | | what tokens are supported
* inline-ttl: remove "default" settingVincent Breitmoser2016-01-063-79/+6
|
* add method to skip cachingVincent Breitmoser2016-01-064-92/+68
|
* 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
|\ | | | | Inline Identity Edit
| * 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
| | | | | | | | guidelines
| * Load key data in tabs independently from advanced activity. This decouples ↵Dominik Schürmann2015-12-293-62/+118
| | | | | | | | the fragments from the activity and allows to init the tabs before loading key data in the advanced activity. Fixes switching to the first tab when key has been edited.
| * 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 ↵Vincent Breitmoser2015-12-271-8/+39
| | | | | | | | (+performance, -recreation crash)
| * extend-uid: button and list to add user idsVincent Breitmoser2015-12-271-2/+49
| |