Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpol | Dominik Schürmann | 2016-01-13 | 2 | -61/+28 |
|\ | | | | | Use Nordpol for BaseNfcActivity | ||||
| * | Use new version of Nordpol from jcenter | Petter Arvidsson | 2016-01-12 | 1 | -1/+1 |
| | | | | | | | | | | - Use version 0.1.13 that is now available on jcenter - Add a "gradle witness" for this version | ||||
| * | Use Nordpol for BaseNfcActivity | Petter Arvidsson | 2016-01-12 | 2 | -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 Breitmoser | 2016-01-13 | 1 | -5/+6 |
|/ | |||||
* | fix symmetric decryption (fixes #1672) | Vincent Breitmoser | 2016-01-12 | 1 | -2/+2 |
| | |||||
* | Fix singleTop definitions | Dominik Schürmann | 2016-01-11 | 1 | -16/+2 |
| | |||||
* | Merge pull request #1666 from open-keychain/file-import-fix | Dominik Schürmann | 2016-01-11 | 1 | -2/+15 |
|\ | | | | | Fixed File Import issue due to onResumeFragments | ||||
| * | fixed file import issue due to onResumeFragments | Adithya Abraham Philip | 2016-01-09 | 1 | -2/+15 |
| | | |||||
* | | passphrasecache: update defaults, add "forever" setting | Vincent Breitmoser | 2016-01-11 | 3 | -4/+10 |
| | | |||||
* | | keycreate: add button to revert to default key configuration | Vincent Breitmoser | 2016-01-11 | 1 | -41/+74 |
| | | |||||
* | | Move edit key configuration to menu | Dominik Schürmann | 2016-01-11 | 1 | -21/+42 |
| | | |||||
* | | Error out when editing a stripped key | Dominik Schürmann | 2016-01-11 | 1 | -1/+6 |
| | | |||||
* | | Advanced screen, warning fragment | Dominik Schürmann | 2016-01-11 | 2 | -10/+70 |
| | | |||||
* | | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 25 | -281/+278 |
|/ | | | | what tokens are supported | ||||
* | inline-ttl: remove "default" setting | Vincent Breitmoser | 2016-01-06 | 3 | -79/+6 |
| | |||||
* | add method to skip caching | Vincent Breitmoser | 2016-01-06 | 4 | -92/+68 |
| | |||||
* | some code cleanup in Preferences | Vincent Breitmoser | 2016-01-06 | 1 | -10/+16 |
| | |||||
* | inline-ttl: support "screen off" in preference | Vincent Breitmoser | 2016-01-06 | 2 | -8/+9 |
| | |||||
* | passcache: add support for clear on screen lock (ttl == 0) | Vincent Breitmoser | 2016-01-06 | 1 | -36/+70 |
| | |||||
* | inline-ttl: use ttl preference in ttl spinner | Vincent Breitmoser | 2016-01-06 | 3 | -32/+25 |
| | |||||
* | inline-ttl: save changes in ttl settings | Vincent Breitmoser | 2016-01-06 | 2 | -25/+60 |
| | |||||
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 7 | -40/+409 |
| | |||||
* | passdialog: seconds field and some minor layout issues | Vincent Breitmoser | 2016-01-06 | 1 | -1/+1 |
| | |||||
* | passphraseactivity: add inline spinner to password dialog | Vincent Breitmoser | 2016-01-06 | 4 | -29/+92 |
| | |||||
* | passdialog: switch to ViewAnimator | Vincent Breitmoser | 2016-01-05 | 1 | -11/+8 |
| | |||||
* | (fix accidental use of api level 23 method) | Vincent Breitmoser | 2016-01-05 | 1 | -5/+10 |
| | |||||
* | minor fixes to ViewKeyActivity | Vincent Breitmoser | 2016-01-05 | 5 | -57/+41 |
| | |||||
* | Check for ACTION_OPEN_DOCUMENT before starting activity | Dominik Schürmann | 2016-01-04 | 1 | -10/+28 |
| | |||||
* | Fallback for ACTION_OPEN_DOCUMENT, hopefully fixes #1625 | Dominik Schürmann | 2016-01-04 | 1 | -3/+12 |
| | |||||
* | Fix #1649 | Dominik Schürmann | 2016-01-04 | 1 | -4/+7 |
| | |||||
* | Fix code style | Dominik Schürmann | 2016-01-02 | 2 | -6/+8 |
| | |||||
* | Temporary fix for #1636 | Dominik Schürmann | 2016-01-01 | 2 | -0/+9 |
| | |||||
* | Merge pull request #1584 from open-keychain/edit-redesign | Dominik Schürmann | 2015-12-31 | 16 | -214/+1623 |
|\ | | | | | Inline Identity Edit | ||||
| * | Add change password menu item to view key | Dominik Schürmann | 2015-12-31 | 1 | -11/+94 |
| | | |||||
| * | Upload to keyserver after editing identities | Dominik Schürmann | 2015-12-31 | 1 | -18/+142 |
| | | |||||
| * | Improve linked identity handling | Dominik Schürmann | 2015-12-31 | 2 | -66/+85 |
| | | |||||
| * | Edit identities design | Dominik Schürmann | 2015-12-31 | 5 | -34/+35 |
| | | |||||
| * | Add activity to edit user ids only | Dominik Schürmann | 2015-12-30 | 4 | -20/+449 |
| | | |||||
| * | Add edit action to user id card, left align card actions per material design ↵ | Dominik Schürmann | 2015-12-29 | 4 | -11/+18 |
| | | | | | | | | guidelines | ||||
| * | Load key data in tabs independently from advanced activity. This decouples ↵ | Dominik Schürmann | 2015-12-29 | 3 | -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 icon | Dominik Schürmann | 2015-12-28 | 1 | -1/+1 |
| | | |||||
| * | Advanced screen: edited key saved | Dominik Schürmann | 2015-12-28 | 2 | -2/+99 |
| | | |||||
| * | Pass trough masterKeyId and fingerprint to advanced key edit fragments | Dominik Schürmann | 2015-12-27 | 3 | -23/+29 |
| | | |||||
| * | inline-edit: move action mode menu handling int activity | Vincent Breitmoser | 2015-12-27 | 3 | -62/+135 |
| | | |||||
| * | inline subkey editing, fixed | Vincent Breitmoser | 2015-12-27 | 3 | -9/+21 |
| | | |||||
| * | inline subkey editing (wip commit) | Vincent Breitmoser | 2015-12-27 | 4 | -14/+294 |
| | | |||||
| * | extend-uid: use FAB instead of extra list item | Vincent Breitmoser | 2015-12-27 | 2 | -2/+20 |
| | | |||||
| * | extended: leave ActionMode on page change | Vincent Breitmoser | 2015-12-27 | 1 | -0/+21 |
| | | |||||
| * | extended-share: move qr code resizing into onLayoutChangeListener ↵ | Vincent Breitmoser | 2015-12-27 | 1 | -8/+39 |
| | | | | | | | | (+performance, -recreation crash) | ||||
| * | extend-uid: button and list to add user ids | Vincent Breitmoser | 2015-12-27 | 1 | -2/+49 |
| | |