aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* smaller dropdown itemsDominik Schürmann2014-07-032-4/+4
|
* Remove unnecessary error logsDominik Schürmann2014-07-022-2/+2
|
* merge KeychainIntentServiceDominik Schürmann2014-07-027-104/+339
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-0211-378/+269
| |\
| * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-027-103/+338
| |\ \
| | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-022-4/+113
| | | | | | | | | | | | | | | | Closes #695
| | * | use expert create key for key creation testing (revert this later on!)Vincent Breitmoser2014-07-021-5/+50
| | | |
| | * | fix subkey additionVincent Breitmoser2014-07-022-37/+62
| | | |
| | * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-295-60/+116
| | | |
* | | | fix nullpointer, cleanupDominik Schürmann2014-07-023-10/+9
| | | |
* | | | remove init methods from adapterDominik Schürmann2014-07-024-88/+53
| |_|/ |/| |
* | | edit key: work on savingDominik Schürmann2014-07-023-23/+24
| | |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-022-1/+6
|\| |
| * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| | |
| * | don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
| | | | | | | | | | | | closes #703
* | | Edit key: adding user idsDominik Schürmann2014-07-0210-221/+258
| | |
* | | edit key: part 3Dominik Schürmann2014-07-014-327/+180
|/ /
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-3015-68/+52
|\ \
| * | Fixed Bootstrap resourceDaniel Albert2014-06-301-1/+1
| | |
| * | Fixed, issue #702Daniel Albert2014-06-301-1/+1
| | |
| * | Merge branch 'master' of https://github.com/open-keychain/open-keychainDaniel Albert2014-06-3021-299/+1109
| |\|
| * | Converted all other buttonsDaniel Albert2014-06-305-30/+20
| | |
| * | Ported even more buttons to use new design (Key and User editor)Daniel Albert2014-06-294-13/+12
| | | | | | | | | | | | Added drawables for them
| * | Converted AsymetricKeyFragment to new button styleDaniel Albert2014-06-291-4/+3
| | |
| * | Added new button style and converted account_settings and the ↵Daniel Albert2014-06-292-9/+6
| | | | | | | | | | | | select_secret_key_layout to use it
| * | Updated file_dialog to use the new buttonsDaniel Albert2014-06-292-7/+6
| | |
| * | Added button_rounded styleDaniel Albert2014-06-281-3/+3
| | | | | | | | | | | | converted decrypt_file_fragment to new style
* | | work on edit keyDominik Schürmann2014-06-304-34/+82
| |/ |/|
* | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-284-83/+119
| |
* | fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-283-3/+20
| |
* | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-288-144/+117
| | | | | | | | closes #698
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-2811-71/+855
|\ \ | |/ |/|
| * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-283-4/+145
| |
| * More wizardryDominik Schürmann2014-06-273-89/+159
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-276-91/+217
| |\
| * | Start work on a first-time wizardDominik Schürmann2014-06-272-4/+399
| | |
| * | new edit key: first version to add user idsDominik Schürmann2014-06-245-58/+236
| | |
* | | Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-271-11/+15
| |/ |/|
* | Merge pull request #690 from mar-v-in/hkps-by-defaultDominik Schürmann2014-06-255-90/+212
|\ \ | | | | | | HKPS by default
| * | Move sks-keyservers.net CA into assets foldermar-v-in2014-06-254-41/+53
| | |
| * | Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-2411-54/+475
| |\ \
| * | | Fix sks-keyservers.net sub poolmar-v-in2014-06-241-1/+1
| | | |
| * | | Update Keyservers to use hkps as neededmar-v-in2014-06-243-2/+25
| | | |
| * | | Use URLEncoder instead of Uri.encodemar-v-in2014-06-241-2/+6
| | | |
| * | | Rewrote hkp add to work with hkps as well.mar-v-in2014-06-241-24/+13
| | | | | | | | | | | | | | | | Also removes HttpClient dependency (deprecated for android)
| * | | Few fixes on hkpsmar-v-in2014-06-232-35/+34
| | | | | | | | | | | | | | | | TODO: Fix add as well
| * | | Add hkps support for sks-keyservers.netmar-v-in2014-06-232-65/+77
| | | |
| * | | Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| | | | | | | | | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
* | | | Merge pull request #688 from da-kid/masterDominik Schürmann2014-06-241-1/+5
|\ \ \ \ | |_|_|/ |/| | | Fix for #687
| * | | Fix for #687Daniel Albert2014-06-241-1/+5
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 04:01:11 +0000