Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -48/+26 |
| | |||||
* | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 1 | -3/+7 |
| | |||||
* | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-17 | 1 | -0/+7 |
| | |||||
* | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 1 | -51/+72 |
| | |||||
* | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 1 | -2/+1 |
| | |||||
* | support for handling keyserver urls from browser, added documentation | Adithya Abraham Philip | 2015-04-20 | 1 | -20/+73 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -18/+15 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -17/+15 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
* | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -1/+3 |
| | | |||||
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 1 | -0/+1 |
|/ | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | ||||
* | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -4/+9 |
| | |||||
* | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -3/+3 |
| | |||||
* | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -1/+1 |
| | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | go to directly to certify screen after nfc import | Vincent Breitmoser | 2015-02-27 | 1 | -63/+0 |
| | |||||
* | Fix nullpointer in ImportKeysActivity | Dominik Schürmann | 2015-01-27 | 1 | -13/+24 |
| | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -76/+82 |
| | |||||
* | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -2/+2 |
| | |||||
* | Use Toolbar and new BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -3/+6 |
| | |||||
* | Remove tabs from import keys activity | Dominik Schürmann | 2014-10-25 | 1 | -174/+50 |
| | |||||
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -4/+13 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -5/+2 |
| | |||||
* | UI stuff | Dominik Schürmann | 2014-10-05 | 1 | -21/+27 |
| | |||||
* | Import code, fix collision of key spinner with other loaders | Dominik Schürmann | 2014-10-04 | 1 | -17/+0 |
| | |||||
* | move IteratorWithSize interface into ParcelableFileCache - much cleaner | Vincent Breitmoser | 2014-10-03 | 1 | -2/+2 |
| | |||||
* | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 1 | -4/+7 |
| | |||||
* | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 1 | -1/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -7/+7 |
| | | | | created ui.util for everything related to formatting | ||||
* | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 1 | -65/+24 |
| | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -2/+2 |
| | |||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -2/+2 |
| | |||||
* | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 1 | -5/+3 |
| | |||||
* | Update and fix Intent API | Dominik Schürmann | 2014-09-07 | 1 | -8/+7 |
| | |||||
* | Make Intent API as recommended in ↵ | Dominik Schürmann | 2014-09-07 | 1 | -4/+4 |
| | | | | http://developer.android.com/guide/components/intents-filters.html | ||||
* | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -1/+4 |
| | | | | Closes #323 | ||||
* | Fix NullPointerException in ImportKeysActivity | Dominik Schürmann | 2014-08-28 | 1 | -1/+3 |
| | |||||
* | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -6/+2 |
| | |||||
* | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -5/+7 |
| | |||||
* | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+2 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -2/+2 |
| | |||||
* | Show file tab only for import of existing keys | Dominik Schürmann | 2014-08-01 | 1 | -15/+42 |
| | |||||
* | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵ | Dominik Schürmann | 2014-07-31 | 1 | -9/+21 |
| | | | | file, fix #592 | ||||
* | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 1 | -3/+2 |
| | |||||
* | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -1/+1 |
| | |||||
* | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -4/+4 |
| | |||||
* | work on edit key | Dominik Schürmann | 2014-06-30 | 1 | -17/+4 |
| | |||||
* | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -79/+18 |
| | |||||
* | fix nullpointerexception in importkeyactivity | Vincent Breitmoser | 2014-06-28 | 1 | -1/+6 |
| | |||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -4/+1 |
| | | | | closes #698 | ||||
* | More wizardry | Dominik Schürmann | 2014-06-27 | 1 | -5/+10 |
| |