aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-10-034-11/+10
|\
| * More beautifyKeyIdWithPrefixDominik Schürmann2014-10-032-3/+2
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-10-0315-122/+80
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
| * | Fix nullpointer with clipboardDominik Schürmann2014-10-032-10/+9
| | |
* | | clean up PgpImportExport a bitVincent Breitmoser2014-10-031-7/+5
| | |
* | | move IteratorWithSize interface into ParcelableFileCache - much cleanerVincent Breitmoser2014-10-034-20/+25
| | |
* | | actually use iterator interface for ParcelableFileCache in activitiesVincent Breitmoser2014-10-034-19/+52
| | |
* | | get rid of two consolidate number preferencesVincent Breitmoser2014-10-035-56/+32
| | |
* | | use iterator interface exclusively in ParcelableFileCacheVincent Breitmoser2014-10-034-19/+21
| |/ |/|
* | more getActivity() checksVincent Breitmoser2014-10-031-2/+11
| |
* | fix nullpointer with subtle attention seekerVincent Breitmoser2014-10-031-8/+9
| |
* | fix hideKeyboard() in other activities as well, just to be safeVincent Breitmoser2014-10-024-0/+12
| |
* | fix NullPointerException in keyboard hackVincent Breitmoser2014-10-021-1/+10
| |
* | make getSignId a secret key operation, and respect unavailable keysVincent Breitmoser2014-10-028-112/+38
|/ | | | This one should remedy #811, but waiting for a test
* Version 3.0Dominik Schürmann2014-10-021-2/+2
|
* mProgressDialogFragment null checkDominik Schürmann2014-10-021-0/+5
|
* Remove unnecessary call to mFingerprintQrCodeDominik Schürmann2014-10-021-2/+0
|
* Fix IllegalStateException in ViewKeyShareFragmentDominik Schürmann2014-10-021-11/+14
|
* Fix nullpointer with getS2K()Dominik Schürmann2014-10-021-1/+2
|
* code styleDominik Schürmann2014-10-021-5/+5
|
* 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 ↵Dominik Schürmann2014-10-013-89/+89
| | | | in decryt screen
* 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
|/ | | | fixes #811, hopefully
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-295-8/+12
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml
| * 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 07:10:55 +0000