aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-23/+37
| | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-3125-362/+182
|\
| * Rename app setting classes for consistencyDominik Schürmann2015-01-302-2/+2
| |
| * Saving of allowed keysDominik Schürmann2015-01-292-0/+13
| |
| * Header image tryoutDominik Schürmann2015-01-293-3/+2
| |
| * Remove files related to old nav drawerDominik Schürmann2015-01-2916-227/+52
| |
| * Fix item layout in apps listDominik Schürmann2015-01-291-10/+10
| |
| * Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-294-119/+98
| |
| * White popup themeDominik Schürmann2015-01-291-3/+7
| |
* | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
|/
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-299-57/+0
|
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
|\ | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
| |
* | Cloud search iconDominik Schürmann2015-01-285-2/+1
| |
* | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-271-0/+2
| |\ \ | | | | | | | | | | | | development
| | * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+1
| | | |
| | * | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-0/+1
| | | |
* | | | Temporary nav drawer fixesDominik Schürmann2015-01-274-2/+27
|/ / /
* / / Material Design DrawerDominik Schürmann2015-01-2627-0/+5
|/ /
* | Material Design: Full screen dialogsDominik Schürmann2015-01-2644-91/+66
| |
* | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+7
| |
* | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
|/ | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
* Style tabs, add missing drawablesDominik Schürmann2015-01-1515-6/+13
|
* Fix drawable sizesDominik Schürmann2015-01-1419-0/+0
|
* Toolbar for settingsDominik Schürmann2015-01-148-3/+13
|
* Integrate QR Code library instead of requiring the app to be installed, also ↵Dominik Schürmann2015-01-141-0/+1
| | | | due to security reasons
* Reorganize folders of graphics sourcesDominik Schürmann2015-01-1437-1/+1
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-141-0/+1
|\ | | | | | | development
| * small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
| |
* | Fix SearchViewDominik Schürmann2015-01-144-19/+44
|/
* Better way to have dark toolbar and light themeDominik Schürmann2015-01-142-33/+3
|
* Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-141-8/+18
|
* Launcher icon fixesDominik Schürmann2015-01-149-12/+0
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-141-1/+36
|\ | | | | | | development
| * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+17
| |
| * support addition of user attributesVincent Breitmoser2015-01-131-0/+3
| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml
| * add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-1/+16
| |
* | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1327-828/+1099
| |
* | GreenDominik Schürmann2015-01-13227-45/+164
| |
* | Start working on Material DesignDominik Schürmann2015-01-1310-125/+154
|/
* Test new iconDominik Schürmann2015-01-076-0/+0
|
* OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
|
* PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
|
* OpenPGP not PGPDominik Schürmann2015-01-072-2/+2
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-069-56/+74
|\ | | | | | | development
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+1
| |
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-0/+1
| |
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-0/+8
| |
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-6/+7
| |