Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ssh authentication supportHEADmaster | hsm | 2016-05-29 | 1 | -0/+1 |
| | |||||
* | Fixed 'Orbot appears not to be running' (#1792) | vanitasvitae | 2016-05-11 | 1 | -0/+6 |
| | |||||
* | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 1 | -21/+64 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib | ||||
| * | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵ | Dominik Schürmann | 2016-04-29 | 1 | -4/+12 |
| |\ | | | | | | | | | | LuboViluda-master | ||||
| | * | Theme change | Lubo Viluda | 2016-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Theme.Keychain.Transparet is used | ||||
| | * | upgrade of Redirect import activity | Lubo Viluda | 2016-03-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified | ||||
| | * | #1661 - Don't expose CertifyActivity | Lubo Viluda | 2016-03-20 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity | ||||
| * | | OTG: Implement hidden activity usb detection technique | Nikita Mikhailov | 2016-04-14 | 1 | -0/+18 |
| | | | |||||
| * | | OTG: Add usb device manager prototype | Nikita Mikhailov | 2016-04-14 | 1 | -0/+5 |
| | | | |||||
| * | | Final commit | Advaita | 2016-03-23 | 1 | -0/+10 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes included Improvements -Reformatted code wherever required -Only active wifi connections trigger events -Improve sync reliability -Removed extra permission Minor Changes -Refactored 2 variables for easier readbility -Wifi-Only-Sync is now enabled by default | ||||
| * | Version 3.9 | Dominik Schürmann | 2016-03-03 | 1 | -5/+0 |
| | | |||||
| * | handle openpgp4fpr intent filter as import rather than certify (see #1661) | Vincent Breitmoser | 2016-03-02 | 1 | -15/+17 |
| | | |||||
| * | external-provider: add (experimental) external provider | Vincent Breitmoser | 2016-02-24 | 1 | -1/+6 |
| | | |||||
* | | Add backup API | Dominik Schürmann | 2016-03-01 | 1 | -0/+4 |
|/ | |||||
* | Extend documentation, proper method naming, use of deprecated method annotation | Dominik Schürmann | 2016-02-22 | 1 | -0/+2 |
| | |||||
* | Split remote methods from activities for better seperation | Dominik Schürmann | 2016-02-22 | 1 | -0/+7 |
| | |||||
* | Extract service parts from SecurityTokenOperationActivity | Dominik Schürmann | 2016-02-22 | 1 | -0/+6 |
| | |||||
* | Split RemoteServiceActivity into multiple activities | Dominik Schürmann | 2016-02-15 | 1 | -8/+21 |
| | |||||
* | after receiving panic trigger and locking app, remove from history | Hans-Christoph Steiner | 2016-01-13 | 1 | -0/+3 |
| | | | | This makes the app fully exit, and removes it from the Recent Apps listing. | ||||
* | respond to generic panic trigger Intent by clearing passphrases | Hans-Christoph Steiner | 2016-01-13 | 1 | -0/+11 |
| | | | | | | PanicKit provides a common framework for creating "panic button" apps that can trigger actions in "panic responder" apps. In this case, the response is to clear all the cached passphrases. | ||||
* | Fix singleTop definitions | Dominik Schürmann | 2016-01-11 | 1 | -9/+7 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -1/+1 |
| | | | | what tokens are supported | ||||
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 1 | -0/+5 |
| | |||||
* | Add activity to edit user ids only | Dominik Schürmann | 2015-12-30 | 1 | -2/+6 |
| | |||||
* | Opt out from fullBackupContent for now | Dominik Schürmann | 2015-12-22 | 1 | -0/+1 |
| | |||||
* | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -0/+16 |
| | |||||
* | Revert "Add first time wizard for sync settings" | Dominik Schürmann | 2015-11-23 | 1 | -11/+0 |
| | | | | This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10. | ||||
* | Add first time wizard for sync settings | Dominik Schürmann | 2015-11-23 | 1 | -0/+11 |
| | |||||
* | Show notification when READ_CONTACTS permission is denied in sync service, ↵ | Dominik Schürmann | 2015-11-23 | 1 | -6/+12 |
| | | | | hide linked contact card if permission is denied | ||||
* | Add READ_EXTERNAL_STORAGE permission | Dominik Schürmann | 2015-11-03 | 1 | -19/+29 |
| | |||||
* | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 1 | -0/+6 |
| | |||||
* | Fix API 23 regression for activities without layout, see ↵ | Dominik Schürmann | 2015-11-02 | 1 | -6/+6 |
| | | | | http://stackoverflow.com/q/32169303 | ||||
* | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 1 | -1/+2 |
| | |||||
* | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for ↵ | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 |
| | | | | db contract | ||||
* | enc-export: handle onSaveInstanceState, add nicer layout for landscape | Vincent Breitmoser | 2015-09-29 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 1 | -3/+1 |
|\ | |||||
| * | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 1 | -3/+1 |
| | | |||||
* | | encrypted export WIP | Vincent Breitmoser | 2015-09-19 | 1 | -0/+8 |
|/ | |||||
* | enable view intent with text/plain (related #290) | Vincent Breitmoser | 2015-09-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 1 | -1/+1 |
|\ | |||||
| * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 1 | -1/+1 |
| | | | | | | | | Move launcher icons to mipmap | ||||
* | | linked: fix "navigate up" in LinkedIdWizard (imperfect) | Vincent Breitmoser | 2015-09-06 | 1 | -1/+3 |
| | | |||||
* | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 1 | -9/+0 |
|/ | |||||
* | linked: redesign github resource creation, implement ouath flow (WIP) | Vincent Breitmoser | 2015-09-01 | 1 | -1/+11 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-08-29 | 1 | -2/+16 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/mgeier63/open-keychain into ↵ | Dominik Schürmann | 2015-08-28 | 1 | -2/+16 |
| |\ | | | | | | | | | | mgeier63-master | ||||
| | * | service side support for https://github.com/open-keychain/openpgp-api/pull/3 | mgeier63 | 2015-08-27 | 1 | -2/+16 |
| | | | |||||
* | | | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -40/+46 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 1 | -0/+17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml |