Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | keychainintentservice: rearrange actions in alphabetical order | Vincent Breitmoser | 2014-10-04 | 1 | -263/+281 | |
|/ | ||||||
* | canonicalize: compare user ids as string rather than bytes | Vincent Breitmoser | 2014-10-04 | 1 | -3/+3 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-10-03 | 1 | -1/+1 | |
|\ | ||||||
| * | Fix string reference | Dominik Schürmann | 2014-10-03 | 1 | -1/+1 | |
| | | ||||||
* | | fix nullpointer on button push while data is still loading | Vincent Breitmoser | 2014-10-03 | 1 | -0/+3 | |
|/ | | | | fixes #934 | |||||
* | Null check for getSelectedEntries | Dominik Schürmann | 2014-10-03 | 1 | -1/+7 | |
| | ||||||
* | one more fix for getting the right subkey in api signing | Vincent Breitmoser | 2014-10-03 | 1 | -19/+19 | |
| | ||||||
* | forgot adjustments in ProviderHelper | Vincent Breitmoser | 2014-10-03 | 1 | -4/+5 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-10-03 | 4 | -11/+10 | |
|\ | ||||||
| * | More beautifyKeyIdWithPrefix | Dominik Schürmann | 2014-10-03 | 2 | -3/+2 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-10-03 | 15 | -122/+80 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | |||||
| * | | Fix nullpointer with clipboard | Dominik Schürmann | 2014-10-03 | 2 | -10/+9 | |
| | | | ||||||
* | | | clean up PgpImportExport a bit | Vincent Breitmoser | 2014-10-03 | 1 | -7/+5 | |
| | | | ||||||
* | | | move IteratorWithSize interface into ParcelableFileCache - much cleaner | Vincent Breitmoser | 2014-10-03 | 4 | -20/+25 | |
| | | | ||||||
* | | | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 4 | -19/+52 | |
| | | | ||||||
* | | | get rid of two consolidate number preferences | Vincent Breitmoser | 2014-10-03 | 4 | -52/+31 | |
| | | | ||||||
* | | | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 4 | -19/+21 | |
| |/ |/| | ||||||
* | | more getActivity() checks | Vincent Breitmoser | 2014-10-03 | 1 | -2/+11 | |
| | | ||||||
* | | fix nullpointer with subtle attention seeker | Vincent Breitmoser | 2014-10-03 | 1 | -8/+9 | |
| | | ||||||
* | | fix hideKeyboard() in other activities as well, just to be safe | Vincent Breitmoser | 2014-10-02 | 4 | -0/+12 | |
| | | ||||||
* | | fix NullPointerException in keyboard hack | Vincent Breitmoser | 2014-10-02 | 1 | -1/+10 | |
| | | ||||||
* | | make getSignId a secret key operation, and respect unavailable keys | Vincent Breitmoser | 2014-10-02 | 8 | -112/+38 | |
|/ | | | | This one should remedy #811, but waiting for a test | |||||
* | mProgressDialogFragment null check | Dominik Schürmann | 2014-10-02 | 1 | -0/+5 | |
| | ||||||
* | Remove unnecessary call to mFingerprintQrCode | Dominik Schürmann | 2014-10-02 | 1 | -2/+0 | |
| | ||||||
* | Fix IllegalStateException in ViewKeyShareFragment | Dominik Schürmann | 2014-10-02 | 1 | -11/+14 | |
| | ||||||
* | Fix nullpointer with getS2K() | Dominik Schürmann | 2014-10-02 | 1 | -1/+2 | |
| | ||||||
* | code style | Dominik Schürmann | 2014-10-02 | 1 | -5/+5 | |
| | ||||||
* | Add null check when retrieving key ids from contacts api | Dominik Schürmann | 2014-10-02 | 1 | -0/+7 | |
| | ||||||
* | Add workaround for bug #912 | Dominik Schürmann | 2014-10-02 | 1 | -0/+7 | |
| | ||||||
* | Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling ↵ | Dominik Schürmann | 2014-10-01 | 2 | -16/+27 | |
| | | | | in decryt screen | |||||
* | More debugging output | Dominik Schürmann | 2014-10-01 | 4 | -25/+79 | |
| | ||||||
* | check key ids when used from api | Dominik Schürmann | 2014-10-01 | 1 | -6/+8 | |
| | ||||||
* | 3.0 beta3 | Dominik Schürmann | 2014-09-30 | 1 | -4/+7 | |
| | ||||||
* | fix minor logic error (haha) | Vincent Breitmoser | 2014-09-30 | 1 | -1/+1 | |
| | ||||||
* | fix ByteBuffer offset mistake in NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -1/+2 | |
| | ||||||
* | pass (encryption) key id from Decrypt*Fragment to NfcActivity | Vincent Breitmoser | 2014-09-30 | 6 | -20/+42 | |
| | ||||||
* | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 3 | -4/+13 | |
| | ||||||
* | add (optional) keyId check in NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -5/+20 | |
| | ||||||
* | revamp fingerprint and keyid methods in NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -18/+47 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-30 | 5 | -10/+15 | |
|\ | ||||||
| * | Fix nullpointer in DecryptActivity | Dominik Schürmann | 2014-09-29 | 1 | -4/+8 | |
| | | ||||||
| * | Fixes for share to decrypt | Dominik Schürmann | 2014-09-29 | 2 | -4/+5 | |
| | | ||||||
| * | Maybe fixes encrypt files on tablets | Dominik Schürmann | 2014-09-29 | 2 | -2/+2 | |
| | | ||||||
* | | request passphrase for correct subkey in OpenPgpService | Vincent Breitmoser | 2014-09-30 | 1 | -7/+8 | |
|/ | | | | fixes #811, hopefully | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-29 | 4 | -7/+2 | |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-29 | 4 | -123/+169 | |
| |\ | ||||||
| * | | Fix NfcActivity task stack problem | Dominik Schürmann | 2014-09-29 | 4 | -7/+2 | |
| | | | ||||||
* | | | add barely functional nfc intent activity (WIP!) | Vincent Breitmoser | 2014-09-29 | 1 | -0/+312 | |
| | | | ||||||
* | | | add class for proper nfc tlv packet parsing | Vincent Breitmoser | 2014-09-29 | 1 | -0/+195 | |
| |/ |/| | ||||||
* | | fix method visibility for tests | Vincent Breitmoser | 2014-09-28 | 2 | -33/+37 | |
| | |