aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
...
* fix messed up importsVincent Breitmoser2015-09-161-2/+3
|
* multidecrypt: change some method params, prepare for open/share of other outputsVincent Breitmoser2015-09-161-29/+16
|
* multidecrypt: don't pass context to adapterVincent Breitmoser2015-09-162-25/+34
|
* multidecrypt: inline setOnClickListenerVincent Breitmoser2015-09-161-46/+26
|
* preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵Vincent Breitmoser2015-09-161-39/+42
| | | | be dragons!)
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-151-3/+0
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-1453-1200/+3869
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml
| * fix up navigation in keyserver select (fixes #1482)Vincent Breitmoser2015-09-112-3/+17
| |
| * no chooser before DisplayTextActivity, can select from there (#1524)Vincent Breitmoser2015-09-111-17/+4
| |
| * add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-111-35/+39
| |
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-111-158/+31
| |
| * linked: improve fragment robustness, save cookies through destroyed fragmentVincent Breitmoser2015-09-101-14/+40
| |
| * linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-102-301/+0
| |
| * linked: move github client id and secret into build varsVincent Breitmoser2015-09-101-8/+5
| |
| * linked: localization for github creationVincent Breitmoser2015-09-101-19/+16
| |
| * linked: don't need javascript, so we don't enable itVincent Breitmoser2015-09-101-1/+0
| |
| * linked: fix screwups from last commit, sighVincent Breitmoser2015-09-101-9/+17
| |
| * linked: work on github lid creation error handlingVincent Breitmoser2015-09-101-38/+125
| |
| * linked: fix auth token revocation (maybe?)Vincent Breitmoser2015-09-081-1/+5
| |
| * linked: add "retry"Vincent Breitmoser2015-09-081-3/+17
| |
| * linked: move between fixed statesVincent Breitmoser2015-09-081-10/+56
| |
| * statusindicator: method to set states by nameVincent Breitmoser2015-09-081-0/+9
| |
| * linked: move client id and secret into static vars (build vars later)Vincent Breitmoser2015-09-081-3/+7
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-061-1/+1
| |\
| | * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-031-1/+1
| | | | | | | | | | | | Move launcher icons to mipmap
| * | linked: clear cookies and don't save form data in oauth webviewVincent Breitmoser2015-09-061-1/+5
| | |
| * | linked: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-063-3/+38
| | |
| * | linked: basic shared element transitionVincent Breitmoser2015-09-067-270/+105
| | |
| * | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-022-99/+171
| |/
| * statusindicator: don't redisplay child with animation if already shownVincent Breitmoser2015-09-011-0/+6
| |
| * linked: smooth over progress with tactical pausesVincent Breitmoser2015-09-011-19/+23
| |
| * linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-012-11/+74
| |
| * fix missing date in CryptoInputParcel in some cases (could be a bigger problem!)Vincent Breitmoser2015-09-011-1/+3
| |
| * linked: work on github designVincent Breitmoser2015-09-012-12/+56
| |
| * linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-014-9/+316
| |
| * add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+25
| |
| * linked: disable DNS resource (for now)Vincent Breitmoser2015-08-311-0/+2
| |
| * Show linked identity menu item and linked identities only when feature is ↵Dominik Schürmann2015-08-292-5/+9
| | | | | | | | enabled
| * Reword experimental settingsDominik Schürmann2015-08-291-2/+4
| |
| * Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2934-45/+2807
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| | * yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-42/+54
| | |
| | * fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| | |
| | * linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
| | |
| | * rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-123-9/+9
| | |
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1126-290/+367
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-1/+1
| | | |
| | * | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-093-3/+4
| | | |
| | * | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-092-12/+12
| | | |
| | * | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-095-13/+13
| | | |
| | * | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0912-98/+94
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 22:57:03 +0000