aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* Make header text and tertiary text color themeableThialfihar2015-07-211-1/+2
|
* add pseudo-static id property to CryptoOperationHelperVincent Breitmoser2015-07-091-1/+1
|
* changed to work with multi-decryptAdithya Abraham Philip2015-06-271-0/+5
|
* deleted KeychainServiceAdithya Abraham Philip2015-06-271-6/+0
|
* migrated import to KeychainNewServiceAdithya Abraham Philip2015-06-271-70/+51
|
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-101-7/+5
|
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-011-6/+6
|
* merged servicesAdithya Abraham Philip2015-06-011-3/+3
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-3/+5
|\ | | | | | | | | | | | | | | | | | | | | | | 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-3/+5
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | first steps toward yubikey activityVincent Breitmoser2015-03-211-0/+1
|/ | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* Reworked Notify classManoj Khanna2015-03-201-1/+1
|
* Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-291-1/+1
|
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-7/+2
|
* Refactor BaseActivityDominik Schürmann2015-01-131-2/+2
|
* Use Toolbar and new BaseActivityDominik Schürmann2015-01-131-3/+6
|
* Start working on Material DesignDominik Schürmann2015-01-131-41/+9
|
* Rename multi certify files to certifyDominik Schürmann2014-10-261-5/+4
|
* Fix result passingDominik Schürmann2014-10-251-1/+0
|
* Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
|
* Fix safe slinger buttonDominik Schürmann2014-10-251-1/+1
|
* Fix safe slinger buttonDominik Schürmann2014-10-251-2/+4
|
* Use selected number of users in safe slingerDominik Schürmann2014-10-251-0/+1
|
* Safe slinger activity prepsDominik Schürmann2014-10-251-5/+228
|
* Start safe slinger activityDominik Schürmann2014-10-231-0/+43