aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-347/+0
|
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-061-12/+0
|\ | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * Fix nfc, make edit activity like a modal dialog, move all menu actions into ↵Dominik Schürmann2014-04-051-12/+0
| | | | | | | | view activity
* | certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-061-6/+1
| |
* | certs: display uid status in uid listVincent Breitmoser2014-04-061-1/+2
| |
* | certs: more fixes, almost working nowVincent Breitmoser2014-04-051-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-051-143/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
| * db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-041-3/+13
| |
| * db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-041-1/+6
| |
| * ViewKeyMainFragment cleanup (don't use inline queries!)Vincent Breitmoser2014-04-041-96/+77
| |
| * db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-0/+8
| |
| * db-overhaul: more work on new providerVincent Breitmoser2014-04-031-31/+28
| | | | | | | | | | | | | | | | | | | | specifics: - secret keys are preserved when a new public key is inserted - started work to give virtual columns a representation in the contract class - streamline ProviderHelper methods. the getUnifiedData method relies on a api level 11 method, not sure yet how to fix/workaround that... - many more small things work as they did before
| * more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-031-4/+0
| |
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * Adjust import orderThialfihar2014-04-021-1/+0
| | |
| * | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-33/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change entire database design. This introduces a lot of changes, notably all URIs and almost all projections. Some features (like key deletion) have been simply commented out for now since they need serious reconsideration. There are a couple of new TODOs marking places where more work is needed. The migration path works fine from what I tested. The old database is not deleted for now, ie, it is reimported at every start of the application making all intermediate changes transient. Tested and working (for me): - All activities in the main drawer - Multiselect and Search - ViewKeyActivity, with and without secret key available - CertifyKeyActivity - SelectSecretKeyActivity (from CertifyKeyActivity) - SelectPublicKeyActivity (from encrypt activity) What doesn't work: - Actually certifying keys (pending a TODO in ProviderHelper) - Importing keys doesn't preserve secret keys - "Encrypt to this contact" doesn't pass key - Editing keys. All controls are disabled, I'm not sure why... (is this even my fault?) - Deleting keys What I didn't test: - Key export - API stuff - Creating keys (since editing doesn't even work)
| * Simplify can encrypt checkDominik Schürmann2014-03-261-19/+24
| |
| * Merge pull request #471 from sreeram-boyapati/encryptionDominik Schürmann2014-03-261-1/+11
| |\ | | | | | | Added can_encrypt check
| | * Added can_encrypt checkSreeram Boyapati2014-03-231-1/+11
| | |
| * | Fix fingerprint handlingDominik Schürmann2014-03-201-1/+1
| | |
| * | put colorize method into key helperDominik Schürmann2014-03-201-1/+1
| |/
| * revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
| |
| * Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-181-5/+6
| |\ | | | | | | Show revocation status in ViewKeyKeysAdapter #375
| | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-181-5/+6
| | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
| * | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
| |\ \ | | | | | | | | Can_Encrypt Check added to hide Button
| | * | Code Style fixSreeram Boyapati2014-03-181-2/+2
| | | |
| | * | Can_Encrypt Check added to hide ButtonSreeram Boyapati2014-03-181-1/+4
| | |/
* | | certs: provider cleanup and bugfixingVincent Breitmoser2014-03-151-10/+14
| | |
* | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-77/+21
|\| | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/values/strings.xml
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-6/+7
| | |
| * | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+21
| | |
| * | move fingerprint coloring into helperVincent Breitmoser2014-03-151-61/+1
| |/
* | Merge branch 'master' into certsVincent Breitmoser2014-03-151-30/+79
|\| | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| * More code style fixes for /uiuberspot2014-03-131-13/+24
| |
| * First code style changes in uiuberspot2014-03-131-10/+5
| |
| * Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
| |\ | | | | | | Add apg's change to colorizing, no more background changes needed
| | * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
| | |
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-131-12/+38
| |\| | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-121-12/+38
| | |
* | | Merge branch 'master' into certsVincent Breitmoser2014-03-121-3/+24
|\| | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-0/+29
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| * | minor clean up in colorize methoduberspot2014-03-111-2/+3
| | |
| * | remove unneeded replace for newline on fingerprintDominik Schürmann2014-03-091-2/+1
| | |
| * | Colorize fingerprintuberspot2014-03-091-3/+25
| | |
| * | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-1/+1
| | |
* | | add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-121-0/+17
| | |
* | | add view cert activityVincent Breitmoser2014-03-121-2/+1
| | |
* | | experimental cert displayVincent Breitmoser2014-03-111-3/+4
| |/ |/|
* | add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-0/+30
|/
* rework key view into fragments to later add certificationsDominik Schürmann2014-02-091-0/+313
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 00:45:07 +0000