| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
added multi-threaded cloud import, restored KeychainIntentService
eliminated code duplication in multi-threaded import
|
|/
|
|
|
| |
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
|
|
|
|
|
| |
in KeychainIntentService and replaced int constants with them. Fixed some
typos.
|
|
|
|
|
|
|
| |
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
|
| |
|
| |
|
| |
|
|
|
|
| |
created ui.util for everything related to formatting
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|