aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
Commit message (Collapse)AuthorAgeFilesLines
* Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-221-0/+2
|
* Split remote methods from activities for better seperationDominik Schürmann2016-02-221-0/+7
|
* Extract service parts from SecurityTokenOperationActivityDominik Schürmann2016-02-221-0/+6
|
* Split RemoteServiceActivity into multiple activitiesDominik Schürmann2016-02-151-8/+21
|
* after receiving panic trigger and locking app, remove from historyHans-Christoph Steiner2016-01-131-0/+3
| | | | This makes the app fully exit, and removes it from the Recent Apps listing.
* respond to generic panic trigger Intent by clearing passphrasesHans-Christoph Steiner2016-01-131-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 definitionsDominik Schürmann2016-01-111-9/+7
|
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-1/+1
| | | | what tokens are supported
* inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-061-0/+5
|
* Add activity to edit user ids onlyDominik Schürmann2015-12-301-2/+6
|
* Opt out from fullBackupContent for nowDominik Schürmann2015-12-221-0/+1
|
* added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-0/+16
|
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-231-11/+0
| | | | This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10.
* Add first time wizard for sync settingsDominik Schürmann2015-11-231-0/+11
|
* Show notification when READ_CONTACTS permission is denied in sync service, ↵Dominik Schürmann2015-11-231-6/+12
| | | | hide linked contact card if permission is denied
* Add READ_EXTERNAL_STORAGE permissionDominik Schürmann2015-11-031-19/+29
|
* Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-021-0/+6
|
* Fix API 23 regression for activities without layout, see ↵Dominik Schürmann2015-11-021-6/+6
| | | | http://stackoverflow.com/q/32169303
* Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-261-1/+2
|
* Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for ↵Dominik Schürmann2015-10-151-1/+1
| | | | db contract
* enc-export: handle onSaveInstanceState, add nicer layout for landscapeVincent Breitmoser2015-09-291-1/+1
|
* Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-281-3/+1
|\
| * Fix DECRYPT_DATA intentDominik Schürmann2015-09-181-3/+1
| |
* | encrypted export WIPVincent Breitmoser2015-09-191-0/+8
|/
* enable view intent with text/plain (related #290)Vincent Breitmoser2015-09-161-1/+1
|
* 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: fix "navigate up" in LinkedIdWizard (imperfect)Vincent Breitmoser2015-09-061-1/+3
| |
* | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-021-9/+0
|/
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-011-1/+11
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-291-2/+16
|\
| * Merge branch 'master' of https://github.com/mgeier63/open-keychain into ↵Dominik Schürmann2015-08-281-2/+16
| |\ | | | | | | | | | mgeier63-master
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-271-2/+16
| | |
* | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-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-identitiesVincent Breitmoser2015-05-111-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-identitiesVincent Breitmoser2015-04-261-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
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-2/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-20/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-2/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-101-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-2/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ \ \ \ \ \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-59/+51
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.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/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | | | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-151-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | intermediate state, nothing really working yetVincent Breitmoser2015-01-121-0/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Remove dead codeDominik Schürmann2015-08-271-1/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | changed sync nameAdithya Abraham Philip2015-08-201-1/+4
| | | | | | | | | | |
* | | | | | | | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-201-0/+14
| | | | | | | | | | |
* | | | | | | | | | | Fix theme problemsDominik Schürmann2015-08-181-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Adpt official theme naming schemaDominik Schürmann2015-08-121-2/+2
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 16:06:28 +0000