aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ServiceProgressHandler.java
Commit message (Collapse)AuthorAgeFilesLines
* introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-271-1/+3
|
* small fix and some cleanup in ServiceProgressFragmentVincent Breitmoser2015-06-221-12/+32
|
* minor code style fixesVincent Breitmoser2015-06-181-1/+3
|
* fix progress for decryptVincent Breitmoser2015-06-101-7/+23
|
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-101-36/+24
|
* Partially revert "switch to native DialogFragment, fix some nullpointers", ↵Vincent Breitmoser2015-06-031-2/+4
| | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
* merged servicesAdithya Abraham Philip2015-06-011-15/+8
|
* switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-311-4/+2
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-0/+2
| | | | | | | | | | | | 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-0/+172
added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import