aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-255-16/+112
* allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-242-1/+8
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-245-39/+56
* only respect most recent signature for key flagsVincent Breitmoser2015-01-192-12/+42
* always show revoked user ids last!Vincent Breitmoser2015-01-191-4/+4
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-192-1/+9
|\
| * No setContentView in onCreate for KeyListActivityVincent2015-01-161-2/+0
| * show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+11
* | Disable sharing chooser blacklisting for lollipopDominik Schürmann2015-01-193-3/+6
|/
* Style tabs, add missing drawablesDominik Schürmann2015-01-155-567/+25
* Yubikey numkey by default to trueDominik Schürmann2015-01-142-1/+4
* Toolbar for settingsDominik Schürmann2015-01-144-14/+41
* Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-2/+6
* fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-143-5/+29
|\
| * small fixes to user attribute handlingVincent Breitmoser2015-01-143-3/+27
| * fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
* | Fix SearchViewDominik Schürmann2015-01-141-20/+4
|/
* Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-142-6/+12
* Launcher icon fixesDominik Schürmann2015-01-142-8/+7
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-1416-101/+662
|\
| * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-147-16/+185
| * make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-149-88/+120
| * hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| * support addition of user attributesVincent Breitmoser2015-01-133-3/+57
| * add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
| * remove LinkedIdentity (committed earlier by accident)Vincent Breitmoser2015-01-131-160/+0
| * add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-124-0/+350
* | Refactor BaseActivityDominik Schürmann2015-01-1326-62/+85
* | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1316-50/+91
* | Start working on Material DesignDominik Schürmann2015-01-138-55/+88
|/
* Merge pull request #1023 from adithyaphilip/developmentDominik Schürmann2015-01-121-7/+28
|\
| * fixed crash when file scheme is passed, broadened deletion scopeAbraham Philip2015-01-091-7/+28
* | Clearup after lockpattern experimentsDominik Schürmann2015-01-062-31/+26
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-0622-200/+547
|\|
| * minor stuffVincent Breitmoser2015-01-033-3/+6
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-033-0/+13
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-032-1/+2
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-037-144/+264
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-022-3/+6
| * throw exception if no data is found in getGenericDataVincent Breitmoser2015-01-021-0/+3
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-022-26/+19
| * fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-021-7/+13
| * extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-023-22/+72
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-012-0/+7
| * add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| * tests: add multi key encryption/decryption test, new way for fake passphrase ...Vincent Breitmoser2015-01-012-2/+2
| * fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-302-33/+89
| |\
| * | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:52:12 +0000