aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | certs: green dots for verified status \o/Vincent Breitmoser2014-03-151-2/+10
| | | | | |
* | | | | | certs: provider cleanup and bugfixingVincent Breitmoser2014-03-155-65/+74
| | | | | |
* | | | | | Merge branch 'certify' into certsVincent Breitmoser2014-03-158-217/+525
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-152-6/+63
| |/ / / / /
| * | | | | certify: sign individual UIDsVincent Breitmoser2014-03-153-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | direct signing of pubkeys is out for now. not sure how this should be handled, but it's trivial to re-add so leaving this up for discussion for now.
| * | | | | certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| | | | | | | | | | | | | | | | | | | | | | | | note this commit introduces NO semantical changes whatsoever!
| * | | | | certify: revamp certifykeyactivityVincent Breitmoser2014-03-152-1/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled.
| * | | | | certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha)Vincent Breitmoser2014-03-151-0/+36
| | | | | |
| * | | | | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-152-12/+82
| | | | | |
| * | | | | certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+10
| | | | | |
| * | | | | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+21
| | | | | |
| * | | | | move fingerprint coloring into helperVincent Breitmoser2014-03-153-61/+64
| |/ / / /
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-15107-2184/+2130
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
| | | | |
| * | | | Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
| | | | |
| * | | | final code style changesuberspot2014-03-1312-106/+132
| | | | |
| * | | | fix code style in /pgpuberspot2014-03-1311-491/+436
| | | | |
| * | | | final ui code style changesuberspot2014-03-1312-53/+54
| | | | |
| * | | | more code style changes in /ui and /utiluberspot2014-03-1324-323/+345
| | | | |
| * | | | more UI code style fixesuberspot2014-03-139-70/+77
| | | | |
| * | | | More code style fixes for /uiuberspot2014-03-1316-53/+91
| | | | |
| * | | | First code style changes in uiuberspot2014-03-1356-634/+486
| | | | |
| * | | | Fix code style in /helperuberspot2014-03-135-71/+64
| | | | |
| * | | | Fix code style in keychain/service/uberspot2014-03-1311-87/+129
| | | | |
| * | | | Optimize imports in all files, remove useless whitespace in some and fix ↵uberspot2014-03-1311-128/+80
| | | | | | | | | | | | | | | | | | | | indentation
| * | | | 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 branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Specifying connection port in KeyServer
| | | * | | | | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | | | | | | |
| | | * | | | | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | | |/ / / /
| * | / / / / Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
| |/ / / / /
| * | | | | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
| | | | | |
| * | | | | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
| | | | | |
| * | | | | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this works well in the uri schema, and we get notifications back with no effort. ....also remove a line I committed accidentally oO
| * | | | | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-28/+118
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * | | | Export cancellable - minor changesgrait2014-03-133-6/+10
| | | | | |
| | * | | | Export is cancellable nowgrait2014-03-133-16/+52
| | | | | |
| | * | | | Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Lint error fix after testing
| | | * \ \ \ Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1016-203/+344
| | | |\ \ \ \
| | | * | | | | Lint changes after testingBhargav Golla2014-03-102-1/+2
| | | | | | | |
| | * | | | | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
| | | | | | | |
| * | | | | | | merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
| * | | | | | | remove special treatment for unified list queryVincent Breitmoser2014-03-131-39/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: the unified query /will/ need special treatment once certs are joined in, so I am leaving this as an artifact commit for later reference or point to revert to.
| * | | | | | | keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-132-56/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?).
* | | | | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-1259-904/+1797
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1213-731/+483
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1228-185/+234
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove duplicate code from ActionBarHelper. Add export in multiselect.
| | * | | | | | | Add Email suggestions in Create Key activityuberspot2014-03-122-5/+53
| | | | | | | | |
| | * | | | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-1112-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imports and throw exceptions
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-26 01:09:36 +0000