aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Add null check when retrieving key ids from contacts apiDominik Schürmann2014-10-022-0/+8
* Add workaround for bug #912Dominik Schürmann2014-10-021-0/+7
* Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in...Dominik Schürmann2014-10-013-89/+89
* More debugging outputDominik Schürmann2014-10-014-25/+79
* Add filterTouchesWhenObscured to prevent Touch-Event HijackingDominik Schürmann2014-10-012-0/+10
* check key ids when used from apiDominik Schürmann2014-10-011-6/+8
* Update from transifexDominik Schürmann2014-09-3065-313/+1332
* Clarify api_create_account_textDominik Schürmann2014-09-301-2/+2
* 3.0 beta3Dominik Schürmann2014-09-302-6/+9
* fix minor logic error (haha)Vincent Breitmoser2014-09-301-1/+1
* fix ByteBuffer offset mistake in NfcActivityVincent Breitmoser2014-09-301-1/+2
* pass (encryption) key id from Decrypt*Fragment to NfcActivityVincent Breitmoser2014-09-306-20/+42
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-303-4/+13
* add (optional) keyId check in NfcActivityVincent Breitmoser2014-09-301-5/+20
* revamp fingerprint and keyid methods in NfcActivityVincent Breitmoser2014-09-301-18/+47
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-3012-59/+28
|\
| * Fix nullpointer in DecryptActivityDominik Schürmann2014-09-291-4/+8
| * 3.0 beta2Dominik Schürmann2014-09-291-2/+2
| * Disable NfcIntentActivity until we implement it properlyDominik Schürmann2014-09-291-10/+10
| * Fixes for share to decryptDominik Schürmann2014-09-292-4/+5
| * Remove unused layoutsDominik Schürmann2014-09-292-35/+0
| * Maybe fixes encrypt files on tabletsDominik Schürmann2014-09-296-5/+4
* | request passphrase for correct subkey in OpenPgpServiceVincent Breitmoser2014-09-301-7/+8
|/
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-295-8/+12
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-295-123/+171
| |\
| * | Fix NfcActivity task stack problemDominik Schürmann2014-09-295-8/+12
* | | add barely functional nfc intent activity (WIP!)Vincent Breitmoser2014-09-292-0/+324
* | | add class for proper nfc tlv packet parsingVincent Breitmoser2014-09-291-0/+195
| |/ |/|
* | fix method visibility for testsVincent Breitmoser2014-09-282-33/+37
* | move can.*() methods to CanonicalizedPublicKey, where they belongVincent Breitmoser2014-09-283-81/+83
* | be more mindful of algorithm and usage flag interactionVincent Breitmoser2014-09-284-16/+44
* | only check for primary binding certificate if key algorithm even supports sig...Vincent Breitmoser2014-09-281-9/+15
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-285-9/+22
|\|
| * Hide keyboard after cloud searchDominik Schürmann2014-09-271-0/+13
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-272-1/+11
| |\
| * | Dont show keyboard by default in key creation to allow the user to get an ove...Dominik Schürmann2014-09-274-9/+9
* | | Reject subkeys with no key flags and no primary key binding certificateVincent Breitmoser2014-09-281-27/+35
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-265-45/+112
|\ \
| * | Fix bug where Keybase extraData gets lost when SKS wins the search race.Tim Bray2014-09-251-0/+10
| |/
| * Fixes for new app listDominik Schürmann2014-09-242-43/+86
| * 3.0 beta1Dominik Schürmann2014-09-242-2/+16
* | nfc: use proper hex encoding for pin lengthVincent Breitmoser2014-09-261-1/+1
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-2438-213/+948
|\
| * Pull from transifexDominik Schürmann2014-09-2438-213/+948
* | disable pull to refresh (for now)Vincent Breitmoser2014-09-241-2/+6
* | fix save button when no file is selectedVincent Breitmoser2014-09-242-0/+5
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-244-35/+155
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-241-5/+6
| |\
| * | propose apps in apps listDominik Schürmann2014-09-244-35/+155
* | | show message about saving multiple files rather than hide the buttonVincent Breitmoser2014-09-242-23/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:57:04 +0000