aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-0231-119/+116
|\ | | | | | | development
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0131-119/+116
| | | | | | | | | | | | | | - 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
* | UI experiments for app settingsDominik Schürmann2015-02-021-0/+8
|/
* Saving of allowed keysDominik Schürmann2015-01-292-214/+63
|
* Header image tryoutDominik Schürmann2015-01-291-2/+1
|
* Remove files related to old nav drawerDominik Schürmann2015-01-292-306/+1
|
* Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-293-129/+131
|
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-296-241/+56
|
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-292-11/+263
|\ | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-11/+100
| |
* | Fix nullpointer in ImportKeysActivityDominik Schürmann2015-01-271-13/+24
| |
* | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-272-13/+14
|\ \ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-272-13/+14
| |\ \ | | | | | | | | | | | | development
| | * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-1/+14
| | | |
| | * | remove unused NonPgpPartExceptionVincent Breitmoser2015-01-261-12/+0
| | | |
* | | | Temporary nav drawer fixesDominik Schürmann2015-01-275-18/+27
|/ / /
* / / Material Design DrawerDominik Schürmann2015-01-265-21/+72
|/ /
* | Material Design: Full screen dialogsDominik Schürmann2015-01-2610-155/+118
| |
* | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-2549-234/+177
| |
* | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-1/+1
| | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
* | move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-242-6/+13
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-192-1/+9
|\| | | | | | | development
| * No setContentView in onCreate for KeyListActivityVincent2015-01-161-2/+0
| |
| * show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+11
| | | | | | | | | | | | | | Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
* | Disable sharing chooser blacklisting for lollipopDominik Schürmann2015-01-192-1/+2
|/
* Style tabs, add missing drawablesDominik Schürmann2015-01-155-567/+25
|
* Yubikey numkey by default to trueDominik Schürmann2015-01-141-0/+3
|
* Toolbar for settingsDominik Schürmann2015-01-144-14/+41
|
* Integrate QR Code library instead of requiring the app to be installed, also ↵Dominik Schürmann2015-01-141-2/+6
| | | | due to security reasons
* fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
|
* Fix SearchViewDominik Schürmann2015-01-141-20/+4
|
* Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-142-6/+12
|
* Launcher icon fixesDominik Schürmann2015-01-142-8/+7
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-144-23/+22
|\ | | | | | | development
| * make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-144-23/+22
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* | Refactor BaseActivityDominik Schürmann2015-01-1322-48/+50
| |
* | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1316-50/+91
| |
* | Start working on Material DesignDominik Schürmann2015-01-137-53/+83
|/
* Merge pull request #1023 from adithyaphilip/developmentDominik Schürmann2015-01-121-7/+28
|\ | | | | Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
| * fixed crash when file scheme is passed, broadened deletion scopeAbraham Philip2015-01-091-7/+28
| |
* | Clearup after lockpattern experimentsDominik Schürmann2015-01-061-25/+25
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-063-8/+11
|\| | | | | | | development
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-4/+6
| |
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-021-1/+2
| |
| * fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-301-32/+85
| |\ | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+3
| | |
* | | Passphrase wizard testsDominik Schürmann2015-01-062-22/+627
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-292-4/+12
|\| | | | | | | development
| * introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-292-4/+12
| | | | | | | | capabilities
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:29:18 +0000