aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | |
* | | | | | | | | | | Style dialog buttonsDominik Schürmann2015-08-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Add theme settingThialfihar2015-07-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares that different themes can be added. Currently light and dark will just use the default OK theme.
* | | | | | | | | | | added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | added retry on upload failureAdithya Abraham Philip2015-07-131-0/+3
| | | | | | | | | | |
* | | | | | | | | | | use only one DeleteDialogActivityAdithya Abraham Philip2015-07-131-3/+0
| | | | | | | | | | |
* | | | | | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-131-0/+6
| | | | | | | | | | |
* | | | | | | | | | | added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-0/+3
| | | | | | | | | | |
* | | | | | | | | | | Subtle design improvements to yubikey dialogDominik Schürmann2015-07-031-1/+1
| | | | | | | | | | |
* | | | | | | | | | | New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-031-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-301-14/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Connect YubiKey URL to OpenKeychainDominik Schürmann2015-06-291-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-11/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Use signature-level signature for TemporaryStorageProvider and describe the ↵Dominik Schürmann2015-06-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | security model
* | | | | | | | | | | | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-271-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | deleted KeychainServiceAdithya Abraham Philip2015-06-271-3/+0
|/ / / / / / / / / / /
* | | | | | | | | | | rename activities to match new purposeVincent Breitmoser2015-06-181-9/+10
| | | | | | | | | | |
* | | | | | | | | | | handle multiple input URIs and Intent.SEND_MULTIPLEVincent Breitmoser2015-06-181-11/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-111-11/+6
|\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 19:05:12 +0000