aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
...
* move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-202-39/+54
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-203-11/+7
|\
| * Notify duration, cleanupDominik Schürmann2014-08-201-4/+2
| |
| * Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
| |
| * return some more resultsDominik Schürmann2014-08-201-6/+2
| |
* | close actionmode in keylist on loading events (avoid inconsistent state)Vincent Breitmoser2014-08-201-0/+10
|/
* progress dialog design fixDominik Schürmann2014-08-202-9/+7
|
* return some more resultsDominik Schürmann2014-08-206-35/+41
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-202-45/+51
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-202-45/+51
| |
* | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-203-13/+24
|/
* Fix mime types, #781mar-v-in2014-08-191-1/+1
|
* ConsolidateDialogActivityDominik Schürmann2014-08-191-41/+26
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-191-0/+117
|\
| * add OpenDialogActivity (stub)Vincent Breitmoser2014-08-191-0/+117
| |
* | Scroll fixes for certify activityDominik Schürmann2014-08-191-0/+15
|/
* Add license headersDominik Schürmann2014-08-193-0/+51
|
* Add subkey: at least one flag should be selected!Dominik Schürmann2014-08-181-53/+74
|
* Fixes for expiry UIDominik Schürmann2014-08-185-69/+101
|
* Merge pull request #772 from mar-v-in/issue-729Vincent2014-08-173-97/+22
|\ | | | | Remove NoSwipeWrapContentViewPager
| * Work-around rendering bug when switching back to asymmetric with multiple ↵mar-v-in2014-08-171-14/+2
| | | | | | | | recipients selected
| * Remove NoSwipeWrapContentViewPagermar-v-in2014-08-172-83/+20
| |
* | consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-0/+60
| |
* | parametrize FileImportCache for filenameVincent Breitmoser2014-08-171-1/+2
| |
* | Fixing date picker issuesDominik Schürmann2014-08-162-22/+47
| |
* | Fix flags UI in add subkey dialogDominik Schürmann2014-08-162-5/+44
| |
* | Fix expiry when adding subkeysDominik Schürmann2014-08-163-6/+5
| |
* | Always return a SaveKeyringResult from savingDominik Schürmann2014-08-161-3/+1
| |
* | fix keys with no expiry in ui codeVincent Breitmoser2014-08-142-2/+2
| |
* | Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-141-2/+2
|/
* Merge pull request #767 from mar-v-in/issue-763Dominik Schürmann2014-08-146-162/+350
|\ | | | | Use dropdown in CertifyActivity
| * Do not allow self certifyingmar-v-in2014-08-143-4/+20
| |
| * Fix KeySpinner on cursor changemar-v-in2014-08-141-1/+6
| |
| * Add and use CertifyKeySpinnermar-v-in2014-08-142-18/+62
| |
| * add OnKeyChangedListener to KeySpinnermar-v-in2014-08-142-11/+41
| |
| * factor KeySpinner outmar-v-in2014-08-144-136/+229
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-141-8/+7
|\ \
| * | handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+7
| | |
* | | hacky fix to prevent key list from scrolling to top when opening nav drawerDominik Schürmann2014-08-141-7/+15
|/ /
* / Automcomplete names and emails in keyserver tabDominik Schürmann2014-08-141-2/+16
|/
* Remove MD5 supportDominik Schürmann2014-08-141-2/+2
|
* Remove support for v3 sig generationDominik Schürmann2014-08-141-18/+0
|
* Dont write version header by defaultDominik Schürmann2014-08-141-9/+9
|
* Add user info dialogDominik Schürmann2014-08-133-20/+128
|
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-133-14/+31
|
* remove bundle for symmetric/asymmetric fragment as it was uselessmar-v-in2014-08-132-31/+16
|
* fix message and uri from encrypt intentmar-v-in2014-08-132-18/+4
|
* Only show relevant keys in encrypt, fix #756 #757mar-v-in2014-08-122-13/+27
|
* Only show keyrings that have a valid sign key in from field, fixes #756mar-v-in2014-08-121-10/+2
|
* Support mime type in metadataDominik Schürmann2014-08-111-1/+0
|