aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
Commit message (Collapse)AuthorAgeFilesLines
* Save split user ids in database #1745fjodor2016-03-071-0/+6
| | | | Save split user ids in database
* keylist: filter results by all user ids for search (fixes #1645)Vincent Breitmoser2015-12-291-0/+6
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-2/+2
| | | |
| * | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-1/+9
| | | |
| * | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-0/+5
| | | |
* | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-201-0/+17
| | | |
* | | | Allow debug build besides release buildDominik Schürmann2015-06-101-1/+1
| |_|/ |/| |
* | | Fixes and clarifications to app signature (or better certificate) pinningDominik Schürmann2015-05-101-1/+1
| |/ |/|
* | Query for duplicate user idsDominik Schürmann2015-03-151-0/+1
|/
* Saving of allowed keysDominik Schürmann2015-01-291-6/+0
|
* Introduce allowed keys table per API clientDominik Schürmann2015-01-291-0/+28
|
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-4/+6
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* minor stuffVincent Breitmoser2015-01-031-0/+1
|
* implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-041-1/+4
|
* New key flags icons, subkey adapter redesign, support authanticate flag in ↵Dominik Schürmann2014-09-201-0/+2
| | | | database
* move IS_REVOKED table prefix to the right placesVincent Breitmoser2014-09-131-1/+1
| | | | Fixes #849
* add ecc supportVincent Breitmoser2014-08-241-0/+1
|
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|
* add HAS_CERTIFY (not sure why it's missing)mar-v-in2014-08-141-0/+1
|
* Add convenience method to unified keyrings to determine whether a keyring is ↵mar-v-in2014-08-121-1/+2
| | | | expired, fix is_revoked for certain usages
* KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-12/+14
|
* use long rather than String to build uris by keyVincent Breitmoser2014-05-211-6/+10
|
* wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵Vincent Breitmoser2014-05-031-0/+6
| | | | signencrypt
* fix unified query columns for select*fragmentVincent Breitmoser2014-04-181-1/+1
|
* add up navigation in ViewCertActivityVincent Breitmoser2014-04-171-0/+4
| | | | Fixes #567
* Rename provider types following ↵Dominik Schürmann2014-04-171-12/+35
| | | | http://developer.android.com/guide/topics/providers/content-provider-creating.html
* stripped support: add has_secret column to keys tableVincent Breitmoser2014-04-161-1/+2
|
* Remove unused blob classes and other dead codeDominik Schürmann2014-04-131-14/+0
|
* Select*KeyFragment rewritesVincent Breitmoser2014-04-101-0/+2
| | | | | | | | | | - moved all specific Public/Secret logic from the Adapter class into inner subclasses in the Fragments - more versatile status display ("revoked", "expired", "can certify"...) - applied view holder pattern - query logic, including subqueries, moved into provider classes Closes #375
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+297