Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -2/+2 |
| | | | | what tokens are supported | ||||
* | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -36/+58 |
| | |||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 1 | -1/+1 |
|\ | |||||
| * | Improve NFC exception handling, fixes RuntimeExceptions | Dominik Schürmann | 2015-09-30 | 1 | -1/+1 |
| | | |||||
* | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 1 | -159/+89 |
|/ | |||||
* | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -2/+1 |
| | |||||
* | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 1 | -24/+3 |
| | |||||
* | some cleanup and fix for back button in ImportKeysActivity (fixes #1372) | Vincent Breitmoser | 2015-07-08 | 1 | -0/+3 |
| | |||||
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 1 | -3/+1 |
| | |||||
* | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+2 |
| | |||||
* | added proxy support to KeybaseLib | Adithya Abraham Philip | 2015-07-03 | 1 | -3/+2 |
| | |||||
* | modify ImportKeysActivity to match new pattern | Adithya Abraham Philip | 2015-07-03 | 1 | -18/+4 |
| | |||||
* | orbot dialog fragments added | Adithya Abraham Philip | 2015-07-03 | 1 | -16/+24 |
| | |||||
* | fixed Proxy generation, proxy working for for cloud import | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+6 |
| | |||||
* | added proxy support, silent right now | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+29 |
| | |||||
* | New NFC dialog design with indeterminate progress, do NFC stuff in background | Dominik Schürmann | 2015-07-03 | 1 | -5/+3 |
| | |||||
* | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
| | |||||
* | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -52/+69 |
| | |||||
* | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -8/+10 |
| | |||||
* | prevent null fragments on activity death | Adithya Abraham Philip | 2015-06-03 | 1 | -3/+3 |
| | |||||
* | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -9/+9 |
| | |||||
* | 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 |