aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Handle encrypted files while importing keysAndrea Torlaschi2016-03-271-4/+11
|
* handle openpgp4fpr intent filter as import rather than certify (see #1661)Vincent Breitmoser2016-03-021-1/+4
|
* Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-221-0/+4
|
* Split remote methods from activities for better seperationDominik Schürmann2016-02-221-19/+2
|
* Fix singleTop definitionsDominik Schürmann2016-01-111-16/+2
|
* Merge pull request #1666 from open-keychain/file-import-fixDominik Schürmann2016-01-111-2/+15
|\ | | | | Fixed File Import issue due to onResumeFragments
| * fixed file import issue due to onResumeFragmentsAdithya Abraham Philip2016-01-091-2/+15
| |
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-2/+2
|/ | | | what tokens are supported
* added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-36/+58
|
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-011-1/+1
|\
| * Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-301-1/+1
| |
* | import: simplify ImportKeysActivity, don't display search bar for fixed inputVincent Breitmoser2015-09-301-159/+89
|/
* add pseudo-static id property to CryptoOperationHelperVincent Breitmoser2015-07-091-2/+1
|
* shifted proxy checking to ImportKeysListCloudLoaderAdithya Abraham Philip2015-07-081-24/+3
|
* some cleanup and fix for back button in ImportKeysActivity (fixes #1372)Vincent Breitmoser2015-07-081-0/+3
|
* added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-3/+1
|
* Rename package back to orbot because these are orbot utilsDominik Schürmann2015-07-031-1/+1
|
* Cleanup tor codeDominik Schürmann2015-07-031-1/+1
|
* ensuring code style is preservedAdithya Abraham Philip2015-07-031-2/+2
|
* added proxy support to KeybaseLibAdithya Abraham Philip2015-07-031-3/+2
|
* modify ImportKeysActivity to match new patternAdithya Abraham Philip2015-07-031-18/+4
|
* orbot dialog fragments addedAdithya Abraham Philip2015-07-031-16/+24
|
* fixed Proxy generation, proxy working for for cloud importAdithya Abraham Philip2015-07-031-2/+6
|
* added proxy support, silent right nowAdithya Abraham Philip2015-07-031-2/+29
|
* New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-031-5/+3
|
* changed to work with multi-decryptAdithya Abraham Philip2015-06-271-0/+5
|
* introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-271-52/+69
|
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-101-8/+10
|
* prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
|
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-9/+9
|
* merged servicesAdithya Abraham Philip2015-06-011-48/+26
|
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-311-3/+7
|
* do nfc dispatching in MainActivityVincent Breitmoser2015-05-171-0/+7
|
* Fix import of keyring with pub+sec key with same key idDominik Schürmann2015-05-061-51/+72
|
* Switch to new library reposDominik Schürmann2015-05-061-2/+1
|
* support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-201-20/+73
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-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 serviceAdithya Abraham Philip2015-03-231-17/+15
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-1/+3
| |
* | first steps toward yubikey activityVincent Breitmoser2015-03-211-0/+1
|/ | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
|
* Reworked Notify classManoj Khanna2015-03-201-3/+3
|
* Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* go to directly to certify screen after nfc importVincent Breitmoser2015-02-271-63/+0
|
* Fix nullpointer in ImportKeysActivityDominik Schürmann2015-01-271-13/+24
|
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-76/+82
|
* Refactor BaseActivityDominik Schürmann2015-01-131-2/+2
|
* Use Toolbar and new BaseActivityDominik Schürmann2015-01-131-3/+6
|
* Remove tabs from import keys activityDominik Schürmann2014-10-251-174/+50
|
* integrate download from keyserver into key import operationVincent Breitmoser2014-10-231-4/+13
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 05:19:23 +0000