Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Workings on new parcel for key downloads | Dominik Schürmann | 2014-10-04 | 5 | -74/+125 |
| | |||||
* | Pass imported master key ids via result parcel | Dominik Schürmann | 2014-10-04 | 1 | -39/+24 |
| | |||||
* | Fixing import, start qr code stuff | Dominik Schürmann | 2014-10-04 | 1 | -50/+116 |
| | |||||
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Dominik Schürmann | 2014-10-04 | 1 | -13/+16 |
|\ | | | | | | | into jacobshack-certify | ||||
| * | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 1 | -13/+16 |
| | | |||||
* | | Import code, fix collision of key spinner with other loaders | Dominik Schürmann | 2014-10-04 | 6 | -45/+320 |
| | | |||||
* | | New add keys activity | Dominik Schürmann | 2014-10-04 | 4 | -4/+289 |
|/ | |||||
* | 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 |
| | |||||
* | 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 | 7 | -10/+42 |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | ||||
| * | | Fix nullpointer with clipboard | Dominik Schürmann | 2014-10-03 | 2 | -10/+9 |
| | | | |||||
* | | | move IteratorWithSize interface into ParcelableFileCache - much cleaner | Vincent Breitmoser | 2014-10-03 | 2 | -7/+3 |
| | | | |||||
* | | | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 3 | -18/+47 |
| | | | |||||
* | | | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | 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 |
|/ | |||||
* | 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 |
| | |||||
* | 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 | 1 | -0/+4 |
| | |||||
* | 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 | 4 | -17/+33 |
| | |||||
* | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -2/+3 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-29 | 3 | -5/+2 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml | ||||
| * | Fix NfcActivity task stack problem | Dominik Schürmann | 2014-09-29 | 3 | -5/+2 |
| | | |||||
* | | add barely functional nfc intent activity (WIP!) | Vincent Breitmoser | 2014-09-29 | 1 | -0/+312 |
|/ | |||||
* | Hide keyboard after cloud search | Dominik Schürmann | 2014-09-27 | 1 | -0/+13 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-27 | 1 | -1/+1 |
|\ | |||||
| * | nfc: use proper hex encoding for pin length | Vincent Breitmoser | 2014-09-26 | 1 | -1/+1 |
| | | | | | | | | Fixes #886 | ||||
* | | Dont show keyboard by default in key creation to allow the user to get an ↵ | Dominik Schürmann | 2014-09-27 | 1 | -3/+1 |
|/ | | | | overview what to type, use spannable where possible | ||||
* | disable pull to refresh (for now) | Vincent Breitmoser | 2014-09-24 | 1 | -2/+6 |
| | |||||
* | fix save button when no file is selected | Vincent Breitmoser | 2014-09-24 | 1 | -0/+4 |
| | |||||
* | show message about saving multiple files rather than hide the button | Vincent Breitmoser | 2014-09-24 | 1 | -23/+8 |
| | |||||
* | move more stuff into EncryptActivity superclass | Vincent Breitmoser | 2014-09-24 | 3 | -226/+147 |
| | |||||
* | use correct pin for nfc in EncryptActivity | Vincent Breitmoser | 2014-09-24 | 2 | -1/+7 |
| | |||||
* | allow 1024 bit key signatures | Vincent Breitmoser | 2014-09-24 | 1 | -3/+2 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-24 | 1 | -26/+26 |
|\ | |||||
| * | Fix logging in NFcActivity | Dominik Schürmann | 2014-09-24 | 1 | -26/+26 |
| | |